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

Commit ce953e44 authored by Silin Huang's avatar Silin Huang Committed by Android (Google) Code Review
Browse files

Merge "Wallet card carousel screen UI polish." into sc-dev

parents 8b2586c6 da80a9a4

packages/SystemUI/res/drawable/circle_wallet_primary_50dp.xml→packages/SystemUI/res/drawable/circle_wallet_primary_56dp.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    <size

        android:height="50dp"

        android:width="50dp" />

        android:height="56dp"

        android:width="56dp" />

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

    <stroke android:width="2dp" android:color="#AECBFA" />

</shape>

packages/SystemUI/res/drawable/circle_wallet_secondary_56dp.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:shape="oval">

    <size

        android:height="56dp"

        android:width="56dp" />

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

    <stroke android:width="2dp" android:color="@color/GM2_grey_300" />

</shape>

packages/SystemUI/res/drawable/wallet_app_button_bg.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

-->

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

    <item>

        <shape android:shape="rectangle">

            <stroke android:width="1dp" android:color="@color/GM2_grey_300"/>

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

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

        </shape>

    </item>

</selector>

packages/SystemUI/res/layout/wallet_fullscreen.xml

+23 −10
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:id="@+id/card_carousel_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="36dp"

        android:layout_marginTop="48dp"

        android:orientation="vertical">

        <ImageView

            android:id="@+id/icon"
@@ -31,7 +31,6 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:layout_marginVertical="10dp"

            android:background="@drawable/circle_wallet_primary_50dp"

            android:scaleType="center"

            android:contentDescription="@null"/>

        <TextView
@@ -50,22 +49,36 @@ 
            android:clipToPadding="false"

            android:layout_marginVertical="24dp"/>



        <Button

            android:id="@+id/wallet_action_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:layout_marginVertical="16dp"

            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:textAlignment="center"

            android:visibility="gone"/>



        <View

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"/>



        <Button

            android:id="@+id/wallet_button"

            android:background="@drawable/wallet_button"

            android:textColor="@color/wallet_white"

            android:textAlignment="center"

            android:id="@+id/wallet_app_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingHorizontal="24dp"

            android:paddingVertical="8dp"

            android:layout_marginVertical="24dp"

            android:layout_gravity="center_horizontal"/>

            android:layout_gravity="center_horizontal"

            android:paddingVertical="@dimen/wallet_button_vertical_padding"

            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:textAlignment="center"

            android:layout_marginVertical="24dp"/>



    </LinearLayout>