Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev

7 files changed, 27 insertions, 15 deletions

diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java
index 72ebc58380b8..37871d0b5a10 100644
--- a/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java
+++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java
@@ -74,7 +74,7 @@ abstract class AccessibilityTarget implements TargetOperations, OnTargetSelected
         holder.mCheckBoxView.setVisibility(isEditMenuMode ? View.VISIBLE : View.GONE);
         holder.mIconView.setImageDrawable(getIcon());
         holder.mLabelView.setText(getLabel());
-        holder.mSwitchItem.setVisibility(View.GONE);
+        holder.mStatusView.setVisibility(View.GONE);
     }
 
     @Override
diff --git a/core/java/com/android/internal/accessibility/dialog/ShortcutTargetAdapter.java b/core/java/com/android/internal/accessibility/dialog/ShortcutTargetAdapter.java
index b7605b7fc011..88e18db8da08 100644
--- a/core/java/com/android/internal/accessibility/dialog/ShortcutTargetAdapter.java
+++ b/core/java/com/android/internal/accessibility/dialog/ShortcutTargetAdapter.java
@@ -68,8 +68,8 @@ class ShortcutTargetAdapter extends TargetAdapter {
             holder.mIconView = convertView.findViewById(R.id.accessibility_shortcut_target_icon);
             holder.mLabelView = convertView.findViewById(
                     R.id.accessibility_shortcut_target_label);
-            holder.mSwitchItem = convertView.findViewById(
-                    R.id.accessibility_shortcut_target_switch_item);
+            holder.mStatusView = convertView.findViewById(
+                    R.id.accessibility_shortcut_target_status);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
diff --git a/core/java/com/android/internal/accessibility/dialog/TargetAdapter.java b/core/java/com/android/internal/accessibility/dialog/TargetAdapter.java
index 1efa17e520ae..28ac9210ac0d 100644
--- a/core/java/com/android/internal/accessibility/dialog/TargetAdapter.java
+++ b/core/java/com/android/internal/accessibility/dialog/TargetAdapter.java
@@ -19,7 +19,6 @@ package com.android.internal.accessibility.dialog;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.Switch;
 import android.widget.TextView;
 
 /**
@@ -30,6 +29,6 @@ abstract class TargetAdapter extends BaseAdapter {
         CheckBox mCheckBoxView;
         ImageView mIconView;
         TextView mLabelView;
-        Switch mSwitchItem;
+        TextView mStatusView;
     }
 }
diff --git a/core/java/com/android/internal/accessibility/dialog/ToggleAccessibilityServiceTarget.java b/core/java/com/android/internal/accessibility/dialog/ToggleAccessibilityServiceTarget.java
index 3a42f7e0edb8..239e531dbfb8 100644
--- a/core/java/com/android/internal/accessibility/dialog/ToggleAccessibilityServiceTarget.java
+++ b/core/java/com/android/internal/accessibility/dialog/ToggleAccessibilityServiceTarget.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager.ShortcutType;
 
+import com.android.internal.R;
 import com.android.internal.accessibility.common.ShortcutConstants.AccessibilityFragmentType;
 import com.android.internal.accessibility.common.ShortcutConstants.ShortcutMenuMode;
 import com.android.internal.accessibility.dialog.TargetAdapter.ViewHolder;
@@ -49,7 +50,11 @@ class ToggleAccessibilityServiceTarget extends AccessibilityServiceTarget {
 
         final boolean isEditMenuMode =
                 shortcutMenuMode == ShortcutMenuMode.EDIT;
-        holder.mSwitchItem.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE);
-        holder.mSwitchItem.setChecked(isAccessibilityServiceEnabled(getContext(), getId()));
+        holder.mStatusView.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE);
+
+        final int statusResId = isAccessibilityServiceEnabled(getContext(), getId())
+                ? R.string.accessibility_shortcut_menu_item_status_on
+                : R.string.accessibility_shortcut_menu_item_status_off;
+        holder.mStatusView.setText(getContext().getString(statusResId));
     }
 }
diff --git a/core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java b/core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java
index fcbf5eccbd9e..5ab9eb84f0e4 100644
--- a/core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java
+++ b/core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java
@@ -23,6 +23,7 @@ import android.provider.Settings;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager.ShortcutType;
 
+import com.android.internal.R;
 import com.android.internal.accessibility.common.ShortcutConstants.AccessibilityFragmentType;
 import com.android.internal.accessibility.common.ShortcutConstants.ShortcutMenuMode;
 import com.android.internal.accessibility.dialog.TargetAdapter.ViewHolder;
@@ -46,8 +47,12 @@ class ToggleWhiteListingFeatureTarget extends AccessibilityTarget {
 
         final boolean isEditMenuMode =
                 shortcutMenuMode == ShortcutMenuMode.EDIT;
-        holder.mSwitchItem.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE);
-        holder.mSwitchItem.setChecked(isFeatureEnabled());
+        holder.mStatusView.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE);
+
+        final int statusResId = isFeatureEnabled()
+                ? R.string.accessibility_shortcut_menu_item_status_on
+                : R.string.accessibility_shortcut_menu_item_status_off;
+        holder.mStatusView.setText(getContext().getString(statusResId));
     }
 
     private boolean isFeatureEnabled() {
diff --git a/core/res/res/layout/accessibility_shortcut_chooser_item.xml b/core/res/res/layout/accessibility_shortcut_chooser_item.xml
index fff22d916b15..7cca1292af68 100644
--- a/core/res/res/layout/accessibility_shortcut_chooser_item.xml
+++ b/core/res/res/layout/accessibility_shortcut_chooser_item.xml
@@ -49,12 +49,13 @@
         android:textColor="?attr/textColorPrimary"
         android:fontFamily="sans-serif-medium"/>
 
-    <Switch
-        android:id="@+id/accessibility_shortcut_target_switch_item"
+    <TextView
+        android:id="@+id/accessibility_shortcut_target_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
-        android:clickable="false"
-        android:focusable="false"/>
+        android:textSize="20sp"
+        android:textColor="?attr/colorAccent"
+        android:fontFamily="sans-serif-medium"/>
+
 </LinearLayout>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 4bc16bba0355..88161f6024fc 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3241,7 +3241,9 @@
   <java-symbol type="id" name="accessibility_shortcut_target_checkbox" />
   <java-symbol type="id" name="accessibility_shortcut_target_icon" />
   <java-symbol type="id" name="accessibility_shortcut_target_label" />
-  <java-symbol type="id" name="accessibility_shortcut_target_switch_item" />
+  <java-symbol type="id" name="accessibility_shortcut_target_status" />
+  <java-symbol type="string" name="accessibility_shortcut_menu_item_status_on" />
+  <java-symbol type="string" name="accessibility_shortcut_menu_item_status_off" />
 
   <!-- Accessibility Button -->
   <java-symbol type="layout" name="accessibility_button_chooser" />