From 4da457f8a9b958e3c8cb47879bb2d5f94f98e846 Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Thu, 6 Feb 2025 10:01:59 +0000
Subject: [PATCH] [Physical Keyboard] Update Input Setting Dialog

1. update button style to use custom one
2. use scrollview so it won't be truncated in shorter screen

Bug:389973784
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Test: atest
packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/

Change-Id: I57765e88751b6090606d56bbe2335813ef7fd2fc
---
 ...ialog_keyboard_a11y_input_setting_keys.xml | 245 ++++++++++--------
 ...yboardAccessibilityKeysDialogFragment.java |  83 +++---
 ...ssibilityBounceKeysDialogFragmentTest.java |   4 +-
 ...cessibilitySlowKeysDialogFragmentTest.java |   4 +-
 4 files changed, 199 insertions(+), 137 deletions(-)

diff --git a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
index addc3473276..bba1e2acff6 100644
--- a/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
+++ b/res/layout/dialog_keyboard_a11y_input_setting_keys.xml
@@ -15,122 +15,161 @@
   limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:gravity="center_horizontal"
-              android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/input_setting_keys_dialog_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:textSize="20sp"
-        android:gravity="center_horizontal"
-        android:textColor="?android:attr/textColorPrimary"
-        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-    />
-
-    <TextView
-        android:id="@+id/input_setting_keys_dialog_subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="26dp"
-        android:layout_marginTop="8dp"
-        android:textSize="16sp"
-        android:gravity="center"
-        android:textColor="?android:attr/textColorSecondary"
-    />
-
-    <RadioGroup
-        android:id="@+id/input_setting_keys_value_group"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="16dp">
-
-        <RadioButton
-            android:id="@+id/input_setting_keys_value_200"
-            android:text="@string/input_setting_keys_dialog_option_200"
-            android:paddingStart="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="start|center_vertical"
-            android:background="@null"/>
-        <RadioButton
-            android:id="@+id/input_setting_keys_value_400"
-            android:text="@string/input_setting_keys_dialog_option_400"
-            android:paddingStart="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="start|center_vertical"
-            android:layout_marginTop="6dp"
-            android:background="@null"/>
-        <RadioButton
-            android:id="@+id/input_setting_keys_value_600"
-            android:text="@string/input_setting_keys_dialog_option_600"
-            android:paddingStart="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="start|center_vertical"
-            android:layout_marginTop="6dp"
-            android:background="@null"/>
-
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:id="@+id/input_keys_dialog_scroll_view"
+    android:gravity="center_horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
         <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/modifier_key_fragment_container"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/input_setting_keys_dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="6dp">
+            android:layout_marginTop="16dp"
+            android:textSize="20sp"
+            android:gravity="center_horizontal"
+            android:textColor="?android:attr/textColorPrimary"
+            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
+        />
+
+        <TextView
+            android:id="@+id/input_setting_keys_dialog_subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="26dp"
+            android:layout_marginTop="8dp"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:textColor="?android:attr/textColorSecondary"
+        />
+
+        <RadioGroup
+            android:id="@+id/input_setting_keys_value_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="16dp">
+
             <RadioButton
-                android:id="@+id/input_setting_keys_value_custom"
+                android:id="@+id/input_setting_keys_value_200"
+                android:text="@string/input_setting_keys_dialog_option_200"
                 android:paddingStart="12dp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:layout_gravity="center_vertical"
-                android:contentDescription="@string/input_setting_keys_custom_title"
+                android:layout_gravity="start|center_vertical"
                 android:background="@null"/>
+            <RadioButton
+                android:id="@+id/input_setting_keys_value_400"
+                android:text="@string/input_setting_keys_dialog_option_400"
+                android:paddingStart="12dp"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_gravity="start|center_vertical"
+                android:layout_marginTop="6dp"
+                android:background="@null"/>
+            <RadioButton
+                android:id="@+id/input_setting_keys_value_600"
+                android:text="@string/input_setting_keys_dialog_option_600"
+                android:paddingStart="12dp"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_gravity="start|center_vertical"
+                android:layout_marginTop="6dp"
+                android:background="@null"/>
+
             <LinearLayout
-                android:id="@+id/input_setting_keys_custom_value_option"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minHeight="48dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                android:paddingEnd="16dp">
-                <TextView
-                    android:id="@+id/input_setting_keys_value_custom_title"
-                    android:text="@string/input_setting_keys_custom_title"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"/>
-                <TextView
-                    android:id="@+id/input_setting_keys_value_custom_value"
-                    android:text="@string/input_setting_keys_custom_value"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                android:layout_marginVertical="6dp">
+                <RadioButton
+                    android:id="@+id/input_setting_keys_value_custom"
+                    android:paddingStart="12dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone"/>
-                <SeekBar
-                    android:id="@+id/input_setting_keys_value_custom_slider"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="36dp"
-                    android:min="1"
-                    android:max="50"
+                    android:contentDescription="@string/input_setting_keys_custom_title"
+                    android:background="@null"/>
+                <LinearLayout
+                    android:id="@+id/input_setting_keys_custom_value_option"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:minHeight="48dp"
                     android:layout_gravity="center_vertical"
-                    android:progressBackgroundTint="@color/input_dialog_slider_progress_background"
-                    android:progressTint="@color/input_dialog_slider_progress"
-                    android:thumbTint="@color/input_dialog_slider_progress"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone"/>
+                    android:gravity="center_vertical"
+                    android:paddingEnd="16dp">
+                    <TextView
+                        android:id="@+id/input_setting_keys_value_custom_title"
+                        android:text="@string/input_setting_keys_custom_title"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"/>
+                    <TextView
+                        android:id="@+id/input_setting_keys_value_custom_value"
+                        android:text="@string/input_setting_keys_custom_value"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginTop="8dp"
+                        android:visibility="gone"/>
+                    <SeekBar
+                        android:id="@+id/input_setting_keys_value_custom_slider"
+                        android:paddingStart="8dp"
+                        android:paddingEnd="36dp"
+                        android:min="1"
+                        android:max="50"
+                        android:progressBackgroundTint="@color/input_dialog_slider_progress_background"
+                        android:progressTint="@color/input_dialog_slider_progress"
+                        android:thumbTint="@color/input_dialog_slider_progress"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginTop="8dp"
+                        android:visibility="gone"/>
+                </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
-    </RadioGroup>
+        </RadioGroup>
 
-</LinearLayout>
\ No newline at end of file
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp">
+
+            <Button
+                android:id="@+id/cancel_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:paddingVertical="14dp"
+                android:layout_toStartOf="@+id/done_button"
+                style="@style/SettingsLibActionButton"
+                android:text="@string/cancel"/>
+
+            <Button
+                android:id="@+id/done_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:layout_marginEnd="8dp"
+                android:layout_alignParentEnd="true"
+                android:paddingVertical="14dp"
+                style="@style/SettingsLibActionButton"
+                android:text="@string/done"/>
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java
index 252ce54768a..97d5b24b5ef 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityKeysDialogFragment.java
@@ -25,6 +25,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
+import android.widget.Button;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
@@ -78,36 +79,41 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
                         R.layout.dialog_keyboard_a11y_input_setting_keys, null);
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
         dialogBuilder.setView(dialoglayout);
-        dialogBuilder.setPositiveButton(android.R.string.ok,
-                        (dialog, which) -> {
-                            RadioGroup radioGroup =
-                                    dialoglayout.findViewById(
-                                            R.id.input_setting_keys_value_group);
-                            SeekBar seekbar = dialoglayout.findViewById(
-                                    R.id.input_setting_keys_value_custom_slider);
-                            RadioButton customRadioButton = dialoglayout.findViewById(
-                                    R.id.input_setting_keys_value_custom);
-                            int threshold;
-                            if (customRadioButton.isChecked()) {
-                                threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
-                            } else {
-                                int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
-                                if (checkedRadioButtonId == R.id.input_setting_keys_value_600) {
-                                    threshold = 600;
-                                } else if (checkedRadioButtonId
-                                        == R.id.input_setting_keys_value_400) {
-                                    threshold = 400;
-                                } else if (checkedRadioButtonId
-                                        == R.id.input_setting_keys_value_200) {
-                                    threshold = 200;
-                                } else {
-                                    threshold = 0;
-                                }
-                            }
-                            updateInputSettingKeysValue(threshold);
-                            onCustomValueUpdated(threshold);
-                        })
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss());
+        Button doneButton = dialoglayout.findViewById(R.id.done_button);
+        doneButton.setOnClickListener(v -> {
+            RadioGroup radioGroup =
+                    dialoglayout.findViewById(
+                            R.id.input_setting_keys_value_group);
+            SeekBar seekbar = dialoglayout.findViewById(
+                    R.id.input_setting_keys_value_custom_slider);
+            RadioButton customRadioButton = dialoglayout.findViewById(
+                    R.id.input_setting_keys_value_custom);
+            int threshold;
+            if (customRadioButton.isChecked()) {
+                threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
+            } else {
+                int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
+                if (checkedRadioButtonId == R.id.input_setting_keys_value_600) {
+                    threshold = 600;
+                } else if (checkedRadioButtonId
+                        == R.id.input_setting_keys_value_400) {
+                    threshold = 400;
+                } else if (checkedRadioButtonId
+                        == R.id.input_setting_keys_value_200) {
+                    threshold = 200;
+                } else {
+                    threshold = 0;
+                }
+            }
+            updateInputSettingKeysValue(threshold);
+            onCustomValueUpdated(threshold);
+            dismiss();
+        });
+
+        Button cancelButton = dialoglayout.findViewById(R.id.cancel_button);
+        cancelButton.setOnClickListener(v -> {
+            dismiss();
+        });
         AlertDialog accessibilityKeyDialog = dialogBuilder.create();
         accessibilityKeyDialog.setOnShowListener(dialog -> {
             RadioGroup cannedValueRadioGroup = accessibilityKeyDialog.findViewById(
@@ -162,8 +168,21 @@ public abstract class KeyboardAccessibilityKeysDialogFragment extends DialogFrag
                 public void onStopTrackingTouch(SeekBar seekBar) {
                 }
             });
-            initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton, customValueTextView,
-                    customProgressBar);
+            if (cannedValueRadioGroup.getCheckedRadioButtonId() == -1
+                    && !customRadioButton.isChecked()) {
+                //if canned radio group and custom are not select, initial check state from input
+                // setting
+                initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton,
+                        customValueTextView,
+                        customProgressBar);
+            } else if (customRadioButton.isChecked()) {
+                cannedValueRadioGroup.clearCheck();
+                customRadioButton.setChecked(true);
+                customValueTextView.setVisibility(View.VISIBLE);
+                customValueTextView.setText(
+                        progressToThresholdInSecond(customProgressBar.getProgress()));
+                customProgressBar.setVisibility(View.VISIBLE);
+            }
         });
 
         final Window window = accessibilityKeyDialog.getWindow();
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysDialogFragmentTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysDialogFragmentTest.java
index 8e5f84e2191..04e4777308c 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysDialogFragmentTest.java
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.app.AlertDialog;
 import android.hardware.input.InputSettings;
 import android.os.Bundle;
+import android.widget.Button;
 import android.widget.RadioGroup;
 
 import androidx.fragment.app.testing.FragmentScenario;
@@ -70,7 +71,8 @@ public class KeyboardAccessibilityBounceKeysDialogFragmentTest {
         RadioGroup radioGroup = mAlertDialog.findViewById(R.id.input_setting_keys_value_group);
         radioGroup.check(R.id.input_setting_keys_value_200);
 
-        mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        Button doneButton = mAlertDialog.findViewById(R.id.done_button);
+        doneButton.performClick();
         ShadowLooper.idleMainLooper();
 
         assertThat(mAlertDialog.isShowing()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysDialogFragmentTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysDialogFragmentTest.java
index 3a3010e7293..145207a08d0 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysDialogFragmentTest.java
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.app.AlertDialog;
 import android.hardware.input.InputSettings;
 import android.os.Bundle;
+import android.widget.Button;
 import android.widget.RadioGroup;
 
 import androidx.fragment.app.testing.FragmentScenario;
@@ -70,7 +71,8 @@ public class KeyboardAccessibilitySlowKeysDialogFragmentTest {
         RadioGroup radioGroup = mAlertDialog.findViewById(R.id.input_setting_keys_value_group);
         radioGroup.check(R.id.input_setting_keys_value_200);
 
-        mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        Button doneButton = mAlertDialog.findViewById(R.id.done_button);
+        doneButton.performClick();
         ShadowLooper.idleMainLooper();
 
         assertThat(mAlertDialog.isShowing()).isFalse();