Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8daf6c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update wallet screen to use MaterialNext colors." into sc-dev

parents 8a520d60 fd27c5b5

packages/SystemUI/res/drawable/wallet_action_button_bg.xml

+4 −3
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

<selector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item>

        <shape android:shape="rectangle">

        <stroke

            android:width="1dp"

            android:color="@color/GM2_blue_600"/>

        <solid android:color="@color/GM2_blue_600"/>

            android:color="?androidprv:attr/colorAccentPrimary"/>

        <solid android:color="?androidprv:attr/colorAccentPrimary"/>

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

        </shape>

    </item>

packages/SystemUI/res/drawable/wallet_empty_state_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License.

  -->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:id="@android:id/mask">

    <shape android:shape="rectangle">

        <solid android:color="#DADCE0" />
@@ -26,7 +26,7 @@ 
        <shape>

        <stroke

            android:width="1dp"

            android:color="@color/GM2_grey_900" />

            android:color="?androidprv:attr/colorAccentPrimary" />

        <corners android:radius="@dimen/wallet_empty_state_corner_radius" />

        </shape>

    </item>

packages/SystemUI/res/layout/wallet_empty_state.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
** limitations under the License.

*/

-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">

<merge xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <LinearLayout

        android:id="@+id/wallet_empty_state"

        android:layout_width="match_parent"
@@ -35,6 +36,7 @@ 
            android:layout_height="28dp"

            android:layout_gravity="center"

            android:layout_marginBottom="8dp"

            android:tint="?androidprv:attr/colorAccentPrimary"

            android:contentDescription="@null"

            android:scaleType="fitCenter"/>

        <TextView

packages/SystemUI/res/layout/wallet_fullscreen.xml

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
-->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false">
@@ -65,7 +67,7 @@ 
            android:paddingVertical="@dimen/wallet_button_vertical_padding"

            android:paddingHorizontal="@dimen/wallet_button_horizontal_padding"

            android:background="@drawable/wallet_action_button_bg"

            android:textColor="@color/wallet_white"

            android:textColor="?androidprv:attr/textColorPrimaryInverse"

            android:textAlignment="center"

            android:visibility="gone"/>
@@ -83,7 +85,7 @@ 
            android:paddingHorizontal="@dimen/wallet_button_horizontal_padding"

            android:background="@drawable/wallet_app_button_bg"

            android:text="@string/wallet_app_button_label"

            android:textColor="@color/GM2_blue_600"

            android:textColor="?androidprv:attr/colorAccentPrimary"

            android:textAlignment="center"

            android:layout_marginVertical="24dp"/>

packages/SystemUI/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -286,7 +286,5 @@ 
    <color name="accessibility_floating_menu_stroke_dark">#26FFFFFF</color> <!-- 15% -->



    <!-- Wallet screen -->

    <color name="wallet_white">#FFFFFF</color>

    <color name="wallet_card_border">#33FFFFFF</color>

    <color name="wallet_primary_text">@color/GM2_grey_900</color>

</resources>