From fb85c52c321d78c29747a5cc0228d4f638a7e684 Mon Sep 17 00:00:00 2001
From: ChenJean <chenjean@google.com>
Date: Thu, 13 Feb 2020 15:14:48 +0800
Subject: [PATCH] Support autoclick secondary action (5/n)

Seekbar UI show complete on all of devices.

Bug: 146019277
Test: manual
Change-Id: I18227db46ba5040082b9a4a691ad8e5233e3e269
---
 res/layout/accessibility_autoclick_custom_seekbar.xml    | 9 +++++----
 res/xml/accessibility_autoclick_settings.xml             | 1 +
 .../ToggleAutoclickCustomSeekbarController.java          | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/res/layout/accessibility_autoclick_custom_seekbar.xml b/res/layout/accessibility_autoclick_custom_seekbar.xml
index 0a60cff2df1..283530bc0fc 100644
--- a/res/layout/accessibility_autoclick_custom_seekbar.xml
+++ b/res/layout/accessibility_autoclick_custom_seekbar.xml
@@ -31,12 +31,12 @@
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical">
 
         <ImageView
-            android:id="@+id/smaller"
+            android:id="@+id/shorter"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
@@ -49,12 +49,13 @@
 
         <SeekBar
             android:id="@+id/autoclick_delay"
-            android:layout_width="260dp"
+            android:layout_width="0dp"
             android:layout_height="48dp"
+            android:layout_weight="1"
             android:contentDescription="@string/accessibility_autoclick_seekbar_desc" />
 
         <ImageView
-            android:id="@+id/larger"
+            android:id="@+id/longer"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index ad588f6af0e..f1261139dd2 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -47,6 +47,7 @@
         android:key="autoclick_custom_seekbar"
         android:layout="@layout/accessibility_autoclick_custom_seekbar"
         android:selectable="false"
+        android:visibility="gone"
         settings:allowDividerBelow="true"
         settings:controller="com.android.settings.accessibility.ToggleAutoclickCustomSeekbarController" />
 
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java b/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
index 301d8dc877a..b98a503fe8b 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
@@ -138,12 +138,12 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
             mDelayLabel = preference.findViewById(R.id.current_label);
             mDelayLabel.setText(delayTimeToString(delayMillis));
 
-            mShorter = preference.findViewById(R.id.smaller);
+            mShorter = preference.findViewById(R.id.shorter);
             mShorter.setOnClickListener(v -> {
                 minusDelayByImageView();
             });
 
-            mLonger = preference.findViewById(R.id.larger);
+            mLonger = preference.findViewById(R.id.longer);
             mLonger.setOnClickListener(v -> {
                 plusDelayByImageView();
             });