Merge "Support non-active tokens in QuickAccessWallet." into sc-dev am: e7d986d294 (225d0ba9) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/circle_wallet_secondary_56dp.xml

deleted100644 → 0

+0 −23

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>

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,13 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false">
		<Toolbar
		android:id="@+id/action_bar"
		style="?android:attr/actionBarStyle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@android:color/transparent"
		android:navigationContentDescription="@null" />
		<LinearLayout
		android:id="@+id/card_carousel_container"
		android:layout_width="match_parent"

+10 −9

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2019 The Android Open Source Project
		<!--
		Copyright (C) 2021 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.
		@@ -13,11 +14,11 @@
		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="#AECBFA" />
		</shape>
		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item
		android:id="@+id/wallet_lockscreen_settings"
		android:enabled="true"
		android:showAsAction="never"
		android:title="@string/wallet_lockscreen_settings_label"
		android:visible="true" />
		</menu>

+1 −0

Original line number	Diff line number	Diff line
		@@ -1483,6 +1483,7 @@

		<!-- Wallet activity screen specs -->
		<dimen name="wallet_icon_size">36sp</dimen>
		<dimen name="wallet_view_header_icon_size">56dp</dimen>
		<dimen name="card_margin">16dp</dimen>
		<dimen name="card_carousel_dot_offset">24dp</dimen>
		<dimen name="card_carousel_dot_unselected_radius">2dp</dimen>

+3 −3

Original line number	Diff line number	Diff line
		@@ -1656,14 +1656,14 @@
		<string name="wallet_app_button_label">Show all</string>
		<!-- Label of the button underneath the card carousel prompting user unlock device. [CHAR LIMIT=NONE] -->
		<string name="wallet_action_button_label_unlock">Unlock to pay</string>
		<!-- Secondary label of the quick access wallet tile if active. [CHAR LIMIT=32] -->
		<string name="wallet_secondary_label_active">Ready</string>
		<!-- Secondary label of the quick access wallet tile if no card. [CHAR LIMIT=NONE] -->
		<string name="wallet_secondary_label_no_card">Set up payment</string>
		<string name="wallet_secondary_label_no_card">Not set up</string>
		<!-- Secondary label of the quick access wallet tile if device locked. [CHAR LIMIT=NONE] -->
		<string name="wallet_secondary_label_device_locked">Unlock to use</string>
		<!-- Message shown when an unknown failure occurred when fetching cards. [CHAR LIMIT=NONE] -->
		<string name="wallet_error_generic">There was a problem getting your cards, please try again later</string>
		<!-- Overflow menu item label to open the lockscreen settings in wallet activity. [CHAR LIMIT=NONE] -->
		<string name="wallet_lockscreen_settings_label">Lock screen settings</string>

		<!-- Name of the work status bar icon. -->
		<string name="status_bar_work">Work profile</string>