Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a80 am: 20c4d45d6a am: 37a45d8987

Browse Source 
Change-Id: I232536ef2070fee49a5e2f7b2747505f27148321
This commit is contained in:
PETER LIANG
2020-04-29 04:36:48 +00:00
committed by Automerger Merge Worker
parent 5be7d2103e 37a45d8987
commit 20ff61ee07
7 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java
View File

@@ -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

4
core/java/com/android/internal/accessibility/dialog/ShortcutTargetAdapter.java
View File

@@ -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();

3
core/java/com/android/internal/accessibility/dialog/TargetAdapter.java
View File

@@ -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;
}
}

9
core/java/com/android/internal/accessibility/dialog/ToggleAccessibilityServiceTarget.java
View File

@@ -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));
}
}

9
core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java
View File

@@ -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() {

11
core/res/res/layout/accessibility_shortcut_chooser_item.xml
View File

@@ -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>

4
core/res/res/values/symbols.xml
View File

@@ -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" />