From 80142305f662afbaafc287c0a2b07fb4b2146e8b Mon Sep 17 00:00:00 2001 From: Silin Huang Date: Mon, 29 Mar 2021 00:31:35 -0700 Subject: [PATCH] Add an activity for wallet card carousel screen. The WalletActivity initializes a WalletScreenController to query the wallet cards and present on the content view. The next step is to launch the new activity from QuickAccessWalletTile. Test: manually test on deivce Test: atest Bug: b/182964813 Change-Id: Idbf0918e111db0d00f3b60b8c26b968c961df202 --- packages/SystemUI/AndroidManifest.xml | 11 + .../drawable/circle_wallet_primary_50dp.xml | 22 + .../SystemUI/res/drawable/rounded_corners.xml | 21 + .../SystemUI/res/drawable/wallet_button.xml | 27 + .../res/drawable/wallet_empty_state_bg.xml | 33 ++ .../res/layout/quick_access_wallet.xml | 22 + .../SystemUI/res/layout/wallet_card_view.xml | 47 ++ .../res/layout/wallet_empty_state.xml | 47 ++ .../SystemUI/res/layout/wallet_fullscreen.xml | 86 ++++ packages/SystemUI/res/values/colors.xml | 5 + packages/SystemUI/res/values/dimens.xml | 11 + packages/SystemUI/res/values/strings.xml | 6 + packages/SystemUI/res/values/styles.xml | 14 + .../systemui/dagger/DependencyProvider.java | 8 - .../systemui/dagger/SystemUIModule.java | 4 +- .../systemui/wallet/dagger/WalletModule.java | 51 ++ .../wallet/ui/DotIndicatorDecoration.java | 181 +++++++ .../systemui/wallet/ui/WalletActivity.java | 122 +++++ .../wallet/ui/WalletCardCarousel.java | 473 ++++++++++++++++++ .../systemui/wallet/ui/WalletCardView.java | 54 ++ .../wallet/ui/WalletCardViewHolder.java | 42 ++ .../wallet/ui/WalletCardViewInfo.java | 50 ++ .../wallet/ui/WalletScreenController.java | 330 ++++++++++++ .../systemui/wallet/ui/WalletView.java | 242 +++++++++ .../wallet/ui/WalletScreenControllerTest.java | 274 ++++++++++ 25 files changed, 2174 insertions(+), 9 deletions(-) create mode 100644 packages/SystemUI/res/drawable/circle_wallet_primary_50dp.xml create mode 100644 packages/SystemUI/res/drawable/rounded_corners.xml create mode 100644 packages/SystemUI/res/drawable/wallet_button.xml create mode 100644 packages/SystemUI/res/drawable/wallet_empty_state_bg.xml create mode 100644 packages/SystemUI/res/layout/quick_access_wallet.xml create mode 100644 packages/SystemUI/res/layout/wallet_card_view.xml create mode 100644 packages/SystemUI/res/layout/wallet_empty_state.xml create mode 100644 packages/SystemUI/res/layout/wallet_fullscreen.xml create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/dagger/WalletModule.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/DotIndicatorDecoration.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletCardCarousel.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletCardView.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletCardViewHolder.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletCardViewInfo.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java create mode 100644 packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java create mode 100644 packages/SystemUI/tests/src/com/android/systemui/wallet/ui/WalletScreenControllerTest.java diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 9f6ef962330e6..c9bd370cd49c8 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -762,6 +762,17 @@ android:visibleToInstantApps="true"> + + + diff --git a/packages/SystemUI/res/drawable/circle_wallet_primary_50dp.xml b/packages/SystemUI/res/drawable/circle_wallet_primary_50dp.xml new file mode 100644 index 0000000000000..de4d882daf532 --- /dev/null +++ b/packages/SystemUI/res/drawable/circle_wallet_primary_50dp.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/rounded_corners.xml b/packages/SystemUI/res/drawable/rounded_corners.xml new file mode 100644 index 0000000000000..a84f57501b578 --- /dev/null +++ b/packages/SystemUI/res/drawable/rounded_corners.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/wallet_button.xml b/packages/SystemUI/res/drawable/wallet_button.xml new file mode 100644 index 0000000000000..bf7625fa956fd --- /dev/null +++ b/packages/SystemUI/res/drawable/wallet_button.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/wallet_empty_state_bg.xml b/packages/SystemUI/res/drawable/wallet_empty_state_bg.xml new file mode 100644 index 0000000000000..f52889adaa536 --- /dev/null +++ b/packages/SystemUI/res/drawable/wallet_empty_state_bg.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/layout/quick_access_wallet.xml b/packages/SystemUI/res/layout/quick_access_wallet.xml new file mode 100644 index 0000000000000..688e1f2521507 --- /dev/null +++ b/packages/SystemUI/res/layout/quick_access_wallet.xml @@ -0,0 +1,22 @@ + + + + diff --git a/packages/SystemUI/res/layout/wallet_card_view.xml b/packages/SystemUI/res/layout/wallet_card_view.xml new file mode 100644 index 0000000000000..5fd556d1fe25b --- /dev/null +++ b/packages/SystemUI/res/layout/wallet_card_view.xml @@ -0,0 +1,47 @@ + + + + + + + + diff --git a/packages/SystemUI/res/layout/wallet_empty_state.xml b/packages/SystemUI/res/layout/wallet_empty_state.xml new file mode 100644 index 0000000000000..3ca0f73c81c8d --- /dev/null +++ b/packages/SystemUI/res/layout/wallet_empty_state.xml @@ -0,0 +1,47 @@ + + + + + + + + diff --git a/packages/SystemUI/res/layout/wallet_fullscreen.xml b/packages/SystemUI/res/layout/wallet_fullscreen.xml new file mode 100644 index 0000000000000..dc678481ea6e6 --- /dev/null +++ b/packages/SystemUI/res/layout/wallet_fullscreen.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + +