File tree Expand file tree Collapse file tree
android/ijkplayer/ijkplayer-example/src/main/res/layout Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- <android .support.v4 .widget.DrawerLayout
1+ <androidx .drawerlayout .widget.DrawerLayout
22 xmlns : android =" http://schemas.android.com/apk/res/android"
33 xmlns : app =" http://schemas.android.com/apk/res-auto"
44 xmlns : tools =" http://schemas.android.com/tools"
3737 android : background =" @color/ijk_transparent_dark"
3838 android : padding =" 8dp" />
3939
40- <android .support.v7 .widget.Toolbar
40+ <androidx .appcompat .widget.Toolbar
4141 android : id =" @+id/toolbar"
4242 android : layout_width =" match_parent"
4343 android : layout_height =" wrap_content"
5454 android : layout_height =" match_parent"
5555 android : layout_gravity =" right"
5656 android : background =" @color/ijk_transparent_dark" />
57- </android .support.v4 .widget.DrawerLayout>
57+ </androidx .drawerlayout .widget.DrawerLayout>
Original file line number Diff line number Diff line change 22 xmlns : app =" http://schemas.android.com/apk/res-auto"
33 xmlns : tools =" http://schemas.android.com/tools" >
44
5- <android .support.v7 .widget.Toolbar
5+ <androidx .appcompat .widget.Toolbar
66 android : id =" @+id/toolbar"
77 android : layout_width =" match_parent"
88 android : layout_height =" wrap_content"
1212 app : popupTheme =" @style/ThemeOverlay.AppCompat.Light"
1313 tools : context =" .toolbar_widget" />
1414
15- </merge >
15+ </merge >
You can’t perform that action at this time.
0 commit comments