From 23a76dae18c9120247146af7906a14632a366e6d Mon Sep 17 00:00:00 2001
From: Jon Spivack <spivack@google.com>
Date: Wed, 14 Apr 2021 18:46:32 -0700
Subject: [PATCH] Go Launcher: Update Overview Actions buttons

This updates the layout of the overview buttons to better match more recent UX mocks. It also restores the buttons' captions, which had gone missing.

Bug: 183448909
Test: Manual (verified on Wembley and Sargo)
Change-Id: I931df92cd0d255289168694d4a950649eec7da75
---
 .../res/layout/overview_actions_container.xml | 49 ++++++++++++-------
 go/quickstep/res/values/styles.xml            | 26 ++++++++++
 2 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 go/quickstep/res/values/styles.xml

diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml
index 866eac6e51..4aa77744aa 100644
--- a/go/quickstep/res/layout/overview_actions_container.xml
+++ b/go/quickstep/res/layout/overview_actions_container.xml
@@ -24,8 +24,8 @@
     <LinearLayout
         android:id="@+id/action_buttons"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/overview_actions_height"
-        android:layout_gravity="bottom|center_horizontal"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:orientation="horizontal">
 
         <Space
@@ -33,19 +33,9 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/action_listen"
-            style="@style/OverviewActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_listen"
-            android:drawablePadding="1dp"
-            android:text="@string/action_listen"
-            android:theme="@style/ThemeControlHighlightWorkspaceColor" />
-
         <Button
             android:id="@+id/action_translate"
-            style="@style/OverviewActionButton"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/ic_translate"
@@ -53,19 +43,29 @@
             android:text="@string/action_translate"
             android:theme="@style/ThemeControlHighlightWorkspaceColor" />
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
         <Button
-            android:id="@+id/action_search"
-            style="@style/OverviewActionButton"
+            android:id="@+id/action_listen"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_search"
+            android:drawableTop="@drawable/ic_listen"
             android:drawablePadding="1dp"
-            android:text="@string/action_search"
+            android:text="@string/action_listen"
             android:theme="@style/ThemeControlHighlightWorkspaceColor" />
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
         <Button
             android:id="@+id/action_screenshot"
-            style="@style/OverviewActionButton"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/ic_screenshot"
@@ -78,9 +78,20 @@
             android:layout_height="1dp"
             android:layout_weight="1" />
 
+        <Button
+            android:id="@+id/action_search"
+            style="@style/GoOverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_search"
+            android:drawablePadding="1dp"
+            android:text="@string/action_search"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/action_share"
-            style="@style/OverviewActionButton"
+            style="@style/GoOverviewActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_share"
diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml
new file mode 100644
index 0000000000..927c49aa05
--- /dev/null
+++ b/go/quickstep/res/values/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+     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.
+-->
+<resources>
+    <style name="GoOverviewActionButton"
+        parent="@android:style/Widget.DeviceDefault.Button">
+        <item name="android:textColor">@color/overview_button</item>
+        <item name="android:drawableTint">@color/overview_button</item>
+        <item name="android:tint">?android:attr/textColorPrimary</item>
+        <item name="android:drawablePadding">8dp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+</resources>
\ No newline at end of file