From 122b4a434a06595d5e4980d2a076861e0ded9d8b Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Thu, 12 May 2022 13:18:28 +0000
Subject: [PATCH] Style fixes for mini resolver

Make the icon 48dp.
Update button style to be opaque for "Open" and outlined for the browser
button.
Fix button padding at the bottom.

Test: Visual inspection with UX. Tested in gesture/3-button + light/dark
      theme
Bug: 175433480
Change-Id: I9304ee6fed28a467fcc54630dab18aaf4f140986
---
 .../internal/app/ResolverActivity.java        |  3 +-
 .../res/color-night/resolver_button_text.xml  | 20 ++++++++++
 core/res/res/color/resolver_button_text.xml   | 20 ++++++++++
 core/res/res/drawable/resolver_button_bg.xml  | 40 +++++++++++++++++++
 .../drawable/resolver_outlined_button_bg.xml  | 32 +++++++++++++++
 core/res/res/layout/miniresolver.xml          | 21 ++++++----
 6 files changed, 127 insertions(+), 9 deletions(-)
 create mode 100644 core/res/res/color-night/resolver_button_text.xml
 create mode 100644 core/res/res/color/resolver_button_text.xml
 create mode 100644 core/res/res/drawable/resolver_button_bg.xml
 create mode 100644 core/res/res/drawable/resolver_outlined_button_bg.xml

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 7e53a5afc3158..b39cffd9a4d77 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -642,7 +642,8 @@ public class ResolverActivity extends Activity implements
 
         if (shouldUseMiniResolver()) {
             View buttonContainer = findViewById(R.id.button_bar_container);
-            buttonContainer.setPadding(0, 0, 0, mSystemWindowInsets.bottom);
+            buttonContainer.setPadding(0, 0, 0, mSystemWindowInsets.bottom
+                    + getResources().getDimensionPixelOffset(R.dimen.resolver_button_bar_spacing));
         }
 
         // Need extra padding so the list can fully scroll up
diff --git a/core/res/res/color-night/resolver_button_text.xml b/core/res/res/color-night/resolver_button_text.xml
new file mode 100644
index 0000000000000..c71db65ffbe4f
--- /dev/null
+++ b/core/res/res/color-night/resolver_button_text.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="?androidprv:attr/textColorPrimaryInverse" />
+</selector>
diff --git a/core/res/res/color/resolver_button_text.xml b/core/res/res/color/resolver_button_text.xml
new file mode 100644
index 0000000000000..7c4bd08c07c5f
--- /dev/null
+++ b/core/res/res/color/resolver_button_text.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="?androidprv:attr/textColorPrimary" />
+</selector>
diff --git a/core/res/res/drawable/resolver_button_bg.xml b/core/res/res/drawable/resolver_button_bg.xml
new file mode 100644
index 0000000000000..9ab063d4c7c6a
--- /dev/null
+++ b/core/res/res/drawable/resolver_button_bg.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2022 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.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+        android:color="@color/resolver_accent_ripple">
+
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="12dp" />
+            <solid android:color="@color/resolver_accent_ripple" />
+        </shape>
+    </item>
+
+    <item>
+        <inset
+            android:insetLeft="0dp"
+            android:insetTop="6dp"
+            android:insetRight="0dp"
+            android:insetBottom="6dp">
+            <shape android:shape="rectangle">
+                <corners android:radius="12dp" />
+                <solid android:color="@color/resolver_profile_tab_selected_bg" />
+            </shape>
+        </inset>
+    </item>
+
+</ripple>
\ No newline at end of file
diff --git a/core/res/res/drawable/resolver_outlined_button_bg.xml b/core/res/res/drawable/resolver_outlined_button_bg.xml
new file mode 100644
index 0000000000000..e811dfad43620
--- /dev/null
+++ b/core/res/res/drawable/resolver_outlined_button_bg.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+    <item>
+        <inset
+            android:insetLeft="0dp"
+            android:insetTop="6dp"
+            android:insetRight="0dp"
+            android:insetBottom="6dp">
+            <shape android:shape="rectangle">
+                <corners android:radius="8dp" />
+                <stroke android:width="1dp"
+                        android:color="?android:attr/colorAccentPrimaryVariant"/>
+            </shape>
+        </inset>
+    </item>
+</ripple>
diff --git a/core/res/res/layout/miniresolver.xml b/core/res/res/layout/miniresolver.xml
index 85fe2835fd5ed..ded23feaca8f9 100644
--- a/core/res/res/layout/miniresolver.xml
+++ b/core/res/res/layout/miniresolver.xml
@@ -36,10 +36,11 @@
 
         <ImageView
             android:id="@+id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
+            android:scaleType="fitCenter"
         />
 
         <TextView
@@ -76,9 +77,8 @@
             android:orientation="horizontal"
             android:layoutDirection="locale"
             android:measureWithLargestChild="true"
-            android:paddingBottom="@dimen/resolver_button_bar_spacing"
-            android:paddingStart="@dimen/resolver_edge_margin"
-            android:paddingEnd="@dimen/resolver_small_margin"
+            android:paddingHorizontal="16dp"
+            android:paddingBottom="2dp"
             android:elevation="@dimen/resolver_elevation">
 
             <Button
@@ -87,7 +87,9 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:maxLines="2"
-                style="@android:style/Widget.DeviceDefault.Button.Borderless"
+                android:background="@drawable/resolver_outlined_button_bg"
+                style="?android:attr/borderlessButtonStyle"
+                android:paddingHorizontal="16dp"
                 android:fontFamily="@android:string/config_headlineFontFamilyMedium"
                 android:textAllCaps="false"
                 android:text="@string/activity_resolver_use_once"
@@ -96,12 +98,15 @@
             <Button
                 android:id="@+id/button_open"
                 android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:maxLines="2"
-                style="@android:style/Widget.DeviceDefault.Button.Colored"
+                android:paddingHorizontal="16dp"
+                android:background="@drawable/resolver_button_bg"
+                style="?android:attr/borderlessButtonStyle"
                 android:fontFamily="@android:string/config_headlineFontFamilyMedium"
                 android:textAllCaps="false"
-                android:layout_height="wrap_content"
+                android:textColor="@color/resolver_button_text"
                 android:text="@string/whichViewApplicationLabel"
             />
         </RelativeLayout>