cb639a9e4b
Another change is a bug fix that do not use the cached "mWalletEnabled" on cards querying, because that param is for the wallet preference only. We use "cardsRetriever"s to handle querying cards on wallet feature/service not available. Also register the wallet service event listener to WalletActivity, this enables the wallet activity finish after the user makes an NFC payment tap. Fixes: 189869634 Fixes: 187970986 Fixes: 188972317 Test: manual- see demo: https: //drive.google.com/file/d/1I-vwffhRqR2HDHR8wQqitOqzH0tWjMEI/view?usp=sharing&resourcekey=0-3BZsJl_c7jzW7muwNG9hmA Change-Id: If907cb5d6c89878d2a5a6a282284e3bf77f7188f
50 lines
1.9 KiB
XML
50 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
**
|
|
** Copyright 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.
|
|
*/
|
|
-->
|
|
<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"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginHorizontal="48dp"
|
|
android:layout_marginTop="48dp"
|
|
android:background="@drawable/wallet_empty_state_bg"
|
|
android:orientation="vertical"
|
|
android:paddingVertical="52dp"
|
|
android:theme="@style/Wallet.Theme"
|
|
android:clipChildren="false"
|
|
android:visibility="gone">
|
|
<ImageView
|
|
android:id="@+id/empty_state_icon"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="28dp"
|
|
android:layout_gravity="center"
|
|
android:layout_marginBottom="8dp"
|
|
android:tint="?androidprv:attr/colorAccentPrimary"
|
|
android:contentDescription="@null"
|
|
android:scaleType="fitCenter"/>
|
|
<TextView
|
|
style="@style/Wallet.TextAppearance"
|
|
android:id="@+id/empty_state_title"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"/>
|
|
</LinearLayout>
|
|
</merge>
|