Bug 1416261 - Use android:theme, as app:theme has been deprecated. r?jwu draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Fri, 10 Nov 2017 17:35:31 +0100
changeset 696665 6e3fb7bee6b0e93bb5c02a5920e096038f44b010
parent 696465 03fe039fa2bd634ecb6073fc73f42c1567f6a93e
child 739896 29423e97d32704ad0882e8ea12850dac49f12892
push id88758
push usermozilla@buttercookie.de
push dateFri, 10 Nov 2017 22:06:29 +0000
reviewersjwu
bugs1416261
milestone58.0a1
Bug 1416261 - Use android:theme, as app:theme has been deprecated. r?jwu MozReview-Commit-ID: Iuf4NfCWnyc
mobile/android/app/src/main/res/layout/bookmark_add_folder.xml
mobile/android/app/src/main/res/layout/bookmark_edit_with_full_page.xml
mobile/android/app/src/main/res/layout/bookmark_folder_select.xml
--- a/mobile/android/app/src/main/res/layout/bookmark_add_folder.xml
+++ b/mobile/android/app/src/main/res/layout/bookmark_add_folder.xml
@@ -11,20 +11,20 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@android:color/white">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         android:background="@color/text_and_tabs_tray_grey"
         app:navigationIcon="@drawable/abc_ic_clear_mtrl_alpha"
         app:subtitleTextColor="@android:color/white"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:title="@string/bookmark_add_folder"
         app:titleTextColor="@android:color/white" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:orientation="vertical"
--- a/mobile/android/app/src/main/res/layout/bookmark_edit_with_full_page.xml
+++ b/mobile/android/app/src/main/res/layout/bookmark_edit_with_full_page.xml
@@ -10,21 +10,21 @@
     android:layout_height="match_parent"
     android:background="@android:color/white"
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="56dp"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         android:background="@color/text_and_tabs_tray_grey"
         android:minHeight="?actionBarSize"
         app:navigationIcon="@drawable/abc_ic_clear_mtrl_alpha"
         app:subtitleTextColor="@android:color/white"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:titleTextColor="@android:color/white" />
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
--- a/mobile/android/app/src/main/res/layout/bookmark_folder_select.xml
+++ b/mobile/android/app/src/main/res/layout/bookmark_folder_select.xml
@@ -10,20 +10,20 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@android:color/white">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         android:background="@color/text_and_tabs_tray_grey"
         app:navigationIcon="@drawable/abc_ic_ab_back_mtrl_am_alpha"
         app:subtitleTextColor="@android:color/white"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:title="@string/bookmark_select_folder" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/folder_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         tools:listitem="@layout/bookmark_folder_item"/>