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

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

Merge "Polish the wallet screen landscape mode." into sc-dev

parents 5f47a376 b54f210c

packages/SystemUI/res/drawable/wallet_app_button_bg.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
  ~ 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_grey_300"/>

            <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentSecondary"/>

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

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

        </shape>

packages/SystemUI/res/layout/wallet_fullscreen.xml

+17 −3
Original line number Diff line number Diff line
@@ -27,12 +27,24 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@android:color/transparent"

        android:navigationContentDescription="@null" />

        android:navigationContentDescription="@null">

        <Button

            android:id="@+id/wallet_toolbar_app_button"

            android:layout_width="wrap_content"

            android:layout_height="30dp"

            android:layout_gravity="end|center_horizontal"

            android:paddingHorizontal="@dimen/wallet_button_horizontal_padding"

            android:background="@drawable/wallet_app_button_bg"

            android:text="@string/wallet_app_button_label"

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

            android:textAlignment="center"

            android:visibility="gone"/>

    </Toolbar>

    <LinearLayout

        android:id="@+id/card_carousel_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="48dp"

        android:layout_marginTop="@dimen/wallet_card_carousel_container_top_margin"

        android:orientation="vertical">

        <androidx.core.widget.NestedScrollView

            android:layout_width="match_parent"
@@ -54,6 +66,7 @@ 
                    android:id="@+id/label"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginBottom="24dp"

                    android:layout_marginHorizontal="48dp"

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

                    android:textAlignment="center"/>
@@ -67,7 +80,7 @@ 
                    android:transitionName="dotIndicator"

                    android:clipChildren="false"

                    android:clipToPadding="false"

                    android:layout_marginVertical="24dp"/>

                    android:layout_marginBottom="24dp"/>

                <Button

                    android:id="@+id/wallet_action_button"

                    android:layout_width="wrap_content"
@@ -83,6 +96,7 @@ 
            </LinearLayout>

        </androidx.core.widget.NestedScrollView>

        <View

            android:id="@+id/dynamic_placeholder"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="0.1"/>

packages/SystemUI/res/values-land/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -64,4 +64,6 @@ 
    <!-- (footer_height -48dp)/2 -->

    <dimen name="controls_management_footer_top_margin">4dp</dimen>

    <dimen name="controls_management_favorites_top_margin">8dp</dimen>



    <dimen name="wallet_card_carousel_container_top_margin">24dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -1546,6 +1546,7 @@ 
    <dimen name="wallet_screen_header_icon_size">56dp</dimen>

    <dimen name="wallet_screen_header_view_size">80dp</dimen>

    <dimen name="card_margin">16dp</dimen>

    <dimen name="wallet_card_carousel_container_top_margin">48dp</dimen>

    <dimen name="card_carousel_dot_offset">24dp</dimen>

    <dimen name="card_carousel_dot_unselected_radius">2dp</dimen>

    <dimen name="card_carousel_dot_selected_radius">3dp</dimen>

packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class WalletActivity extends LifecycleActivity implements 
            }

        };



        walletView.getAppButton().setOnClickListener(

        walletView.setShowWalletAppOnClickListener(

                v -> {

                    if (mWalletClient.createWalletIntent() == null) {

                        Log.w(TAG, "Unable to create wallet app intent.");