For #24252 - Rename above attribute to layer2

2 years ago · 4263e1fd62
parent 9817be4fd0
commit 4263e1fd62
21 changed files with 22 additions and 25 deletions
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
@ -78,7 +78,7 @@ class TabInCollectionViewHolder(
        if (isLastItem) {
            view.background = AppCompatResources.getDrawable(context, R.drawable.rounded_bottom_corners)
        } else {
-            view.setBackgroundColor(context.getColorFromAttr(R.attr.above))
+            view.setBackgroundColor(context.getColorFromAttr(R.attr.layer2))
        }
    }

--- a/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
+++ b/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
@ -4,5 +4,5 @@
    <corners
            android:topLeftRadius="@dimen/bottom_sheet_corner_radius"
            android:topRightRadius="@dimen/bottom_sheet_corner_radius" />
-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
 </shape>
--- a/app/src/main/res/drawable/dialog_background.xml
+++ b/app/src/main/res/drawable/dialog_background.xml
@ -5,5 +5,5 @@

 <shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="8dp"/>
-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
 </shape>
--- a/app/src/main/res/drawable/inactive_tab_auto_close_border_background.xml
+++ b/app/src/main/res/drawable/inactive_tab_auto_close_border_background.xml
@ -10,5 +10,5 @@

    <corners android:radius="8dp" />

-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
 </shape>
--- a/app/src/main/res/drawable/onboarding_card_background_light.xml
+++ b/app/src/main/res/drawable/onboarding_card_background_light.xml
@ -5,6 +5,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <stroke android:width="1dp" android:color="?neutralFaded" />
-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
    <corners android:radius="8dp" />
 </shape>
--- a/app/src/main/res/drawable/onboarding_rounded_bottom_corners_ripple.xml
+++ b/app/src/main/res/drawable/onboarding_rounded_bottom_corners_ripple.xml
@ -17,7 +17,7 @@
            <stroke
                android:width="1dp"
                android:color="?neutralFaded" />
-            <solid android:color="?above" />
+            <solid android:color="?attr/layer2" />
            <corners
                android:bottomLeftRadius="@dimen/tab_corner_radius"
                android:bottomRightRadius="@dimen/tab_corner_radius" />
--- a/app/src/main/res/drawable/progress_gradient.xml
+++ b/app/src/main/res/drawable/progress_gradient.xml
@ -5,7 +5,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:id="@android:id/background">
        <shape>
-            <solid android:color="?above" />
+            <solid android:color="?attr/layer2" />
        </shape>
    </item>

--- a/app/src/main/res/drawable/rounded_all_corners.xml
+++ b/app/src/main/res/drawable/rounded_all_corners.xml
@ -3,6 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
    <corners android:radius="@dimen/tab_corner_radius"/>
 </shape>
--- a/app/src/main/res/drawable/rounded_bottom_corners.xml
+++ b/app/src/main/res/drawable/rounded_bottom_corners.xml
@ -4,6 +4,6 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
    <corners android:bottomLeftRadius="@dimen/tab_corner_radius" android:bottomRightRadius="@dimen/tab_corner_radius" />
 </shape>
--- a/app/src/main/res/drawable/rounded_top_corners.xml
+++ b/app/src/main/res/drawable/rounded_top_corners.xml
@ -3,6 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?above" />
+    <solid android:color="?attr/layer2" />
    <corners android:topLeftRadius="@dimen/tab_corner_radius" android:topRightRadius="@dimen/tab_corner_radius" />
 </shape>
--- a/app/src/main/res/drawable/sign_in_preference_background.xml
+++ b/app/src/main/res/drawable/sign_in_preference_background.xml
@ -12,7 +12,7 @@
    </item>
    <item>
        <shape>
-            <solid android:color="?above" />
+            <solid android:color="?attr/layer2" />
            <corners android:radius="8dp" />
        </shape>
    </item>
--- a/app/src/main/res/layout/collection_tab_list_row.xml
+++ b/app/src/main/res/layout/collection_tab_list_row.xml
@ -14,7 +14,7 @@
    android:clipToPadding="false"
    android:focusable="true"
    android:foreground="?android:attr/selectableItemBackground"
-    app:cardBackgroundColor="?above"
+    app:cardBackgroundColor="?attr/layer2"
    app:cardCornerRadius="@dimen/tab_corner_radius"
    app:cardElevation="5dp">

--- a/app/src/main/res/layout/collections_list_item.xml
+++ b/app/src/main/res/layout/collections_list_item.xml
@ -14,7 +14,7 @@
    android:clipToPadding="false"
    android:focusable="true"
    android:foreground="?android:attr/selectableItemBackground"
-    app:cardBackgroundColor="?above"
+    app:cardBackgroundColor="?attr/layer2"
    app:cardCornerRadius="@dimen/tab_corner_radius"
    app:cardElevation="5dp">

--- a/app/src/main/res/layout/dropdown_preference_etp.xml
+++ b/app/src/main/res/layout/dropdown_preference_etp.xml
@ -18,7 +18,7 @@
        android:id="@+id/spinner"
        android:layout_width="match_parent"
        android:layout_height="48dp"
-        android:popupBackground="?above"
+        android:popupBackground="?attr/layer2"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
--- a/app/src/main/res/layout/inactive_tab_list_item.xml
+++ b/app/src/main/res/layout/inactive_tab_list_item.xml
@ -16,7 +16,7 @@
        android:id="@+id/site_list_item"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="?above"
+        android:background="?attr/layer2"
        android:foreground="?android:attr/selectableItemBackground"
        android:minHeight="@dimen/mozac_widget_site_item_height" />
 </FrameLayout>
--- a/app/src/main/res/layout/inactive_tabs_auto_close.xml
+++ b/app/src/main/res/layout/inactive_tabs_auto_close.xml
@ -13,7 +13,7 @@
    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="?above"
+        android:background="?attr/layer2"
        android:clickable="false"
        android:clipToPadding="false"
        android:focusable="true"
--- a/app/src/main/res/layout/share_tab_item.xml
+++ b/app/src/main/res/layout/share_tab_item.xml
@ -15,7 +15,7 @@
        android:layout_height="40dp"
        android:padding="8dp"
        android:background="@drawable/favicon_background"
-        android:backgroundTint="?above"
+        android:backgroundTint="?attr/layer2"
        android:importantForAccessibility="no"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
--- a/app/src/main/res/layout/view_crash_reporter.xml
+++ b/app/src/main/res/layout/view_crash_reporter.xml
@ -8,7 +8,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?above">
+    android:background="?attr/layer2">

    <ImageView
        android:id="@+id/crash_tab_image"
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@ -49,7 +49,6 @@
    <attr name="accentHighContrast" format="reference" />
    <attr name="accentUsedOnDarkBackground" format="reference" />
    <attr name="snackbar" format="reference" />
-    <attr name="above" format="reference" />
    <attr name="neutral" format="reference" />
    <attr name="neutralFaded" format="reference" />
    <attr name="destructive" format="reference"/>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -132,7 +132,7 @@
    <!-- Default Screen background, Frontlayer background, App Bar Top, App Bar Bottom, Frontlayer header -->
    <color name="fx_mobile_private_layer_color_1">@color/photonInk50</color>
    <!-- Card background, Menu background, Dialog, Banner -->
-    <color name="fx_mobile_private_layer_color_2" tools:ignore="UnusedResources">@color/photonInk50</color>
+    <color name="fx_mobile_private_layer_color_2">@color/photonInk50</color>
    <!-- Search -->
    <color name="fx_mobile_private_layer_color_3">@color/photonInk50</color>
    <!-- Homescreen background, Toolbar -->
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -84,7 +84,6 @@
        <item name="accent">@color/accent_normal_theme</item>
        <item name="accentBright">@color/photonViolet70</item>
        <item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
-        <item name="above">@color/fx_mobile_layer_color_2</item>
        <item name="neutral">@color/neutral_normal_theme</item>
        <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
        <item name="destructive">@color/fx_mobile_text_color_warning</item>
@ -160,7 +159,7 @@
        <item name="android:titleTextStyle">@style/HeaderTextStyle</item>
        <item name="android:windowTitleStyle">@style/HeaderTextStyle</item>
        <item name="dialogCornerRadius">@dimen/tab_corner_radius</item>
-        <item name="android:colorBackground">?above</item>
+        <item name="android:colorBackground">?attr/layer2</item>
        <item name="colorAccent">?accent</item>
        <item name="android:textColorPrimary">?attr/textPrimary</item>
    </style>
@ -277,7 +276,6 @@
        <item name="accent">@color/accent_private_theme</item>
        <item name="accentBright">@color/photonViolet70</item>
        <item name="accentHighContrast">@color/accent_high_contrast_private_theme</item>
-        <item name="above">@color/fx_mobile_private_layer_color_1</item>
        <item name="neutral">@color/neutral_private_theme</item>
        <item name="neutralFaded">@color/neutral_faded_private_theme</item>
        <item name="destructive">@color/fx_mobile_private_text_color_warning</item>
@ -317,10 +315,10 @@
    </style>

    <style name="Mozac.Browser.Menu" parent="" tools:ignore="UnusedResources">
-        <item name="cardBackgroundColor">?above</item>
+        <item name="cardBackgroundColor">?attr/layer2</item>
    </style>
    <style name="Mozac.Browser.Menu2" parent="" tools:ignore="UnusedResources">
-        <item name="cardBackgroundColor">?above</item>
+        <item name="cardBackgroundColor">?attr/layer2</item>
    </style>

    <style name="PrivateTheme" parent="PrivateThemeBase" />