Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev (c463e56a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -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));
		}
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -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() {