summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorSean Pont <seanpont@google.com>2020-04-27 09:56:09 -0700
committerSean Pont <seanpont@google.com>2020-04-27 13:47:55 -0700
commit590c126dbbc56ea177073264f77105efd1d7cb00 (patch)
tree59c4ca7c7ab5d717067a2cf7fb855297f32f9142 /res
parentb8bee46a7f452a4fb66c4e5c8fdf3ef38c5c1fcd (diff)
downloadQuickAccessWallet-590c126dbbc56ea177073264f77105efd1d7cb00.tar.gz
Remove extra padding and dismiss gesture listener
Also update border on zero-state button per mocks. Bug: 152879981 Test: atest QuickAccessWalletRoboTests Test: manual Change-Id: Ie444ae1b8e9c81ffc81d2a329e9a698b0f46eeae
Diffstat (limited to 'res')
-rw-r--r--res/drawable/wallet_empty_state_bg.xml4
-rw-r--r--res/layout/wallet_card_view.xml2
-rw-r--r--res/layout/wallet_view.xml21
3 files changed, 10 insertions, 17 deletions
diff --git a/res/drawable/wallet_empty_state_bg.xml b/res/drawable/wallet_empty_state_bg.xml
index 58ea044..170253c 100644
--- a/res/drawable/wallet_empty_state_bg.xml
+++ b/res/drawable/wallet_empty_state_bg.xml
@@ -17,8 +17,8 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
- <stroke android:width="1dp" android:color="@*android:color/foreground_material_dark"/>
- <corners android:radius="12dp"/>
+ <stroke android:width="1dp" android:color="#66FFFFFF"/>
+ <corners android:radius="20dp"/>
</shape>
</item>
<item android:drawable="?android:selectableItemBackground"/>
diff --git a/res/layout/wallet_card_view.xml b/res/layout/wallet_card_view.xml
index 3b1f7c1..3e2ad4c 100644
--- a/res/layout/wallet_card_view.xml
+++ b/res/layout/wallet_card_view.xml
@@ -24,7 +24,7 @@
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_margin="@dimen/card_margin"
+ android:layout_marginHorizontal="@dimen/card_margin"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@android:color/transparent"
app:cardElevation="12dp">
diff --git a/res/layout/wallet_view.xml b/res/layout/wallet_view.xml
index ffc7e70..a35feed 100644
--- a/res/layout/wallet_view.xml
+++ b/res/layout/wallet_view.xml
@@ -15,11 +15,9 @@
~ limitations under the License.
-->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="24dp"
android:clipChildren="false">
<LinearLayout
@@ -41,9 +39,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:importantForAccessibility="no"
- android:paddingBottom="4dp"
android:drawablePadding="8dp"
- android:textAlignment="center"/>
+ android:textAlignment="center" />
<ImageView
android:id="@+id/menu_btn"
@@ -55,8 +52,7 @@
android:tint="@color/wallet_more_vert"
android:contentDescription="@strings/accessibility_menu"
android:background="?android:attr/selectableItemBackgroundBorderless"
- android:theme="@style/Wallet.Theme"
- />
+ android:theme="@style/Wallet.Theme" />
</FrameLayout>
<com.android.systemui.plugin.globalactions.wallet.WalletCardCarousel
@@ -64,25 +60,22 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
- android:clipToPadding="false"/>
+ android:clipToPadding="false" />
</LinearLayout>
- <include layout="@layout/empty_state_view"/>
+ <include layout="@layout/empty_state_view" />
<TextView
android:id="@+id/error_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
- android:layout_marginBottom="50dp"
- android:layout_marginLeft="24dp"
- android:layout_marginRight="24dp"
+ android:layout_marginHorizontal="40dp"
android:textSize="14sp"
android:textColor="#DADCE0"
- android:padding="15dp"
android:elevation="7dp"
android:background="@drawable/rounded_corners"
android:gravity="center"
- android:visibility="gone"/>
+ android:visibility="gone" />
</FrameLayout>