Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 (3a059026) · Commits · e / os / android_packages_apps_Settings

res/layout/accessibility_shortcut_secondary_action.xml

+12 −18

Original line number	Diff line number	Diff line
		@@ -29,27 +29,22 @@
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:gravity="start\|center_vertical"
		android:focusable="true"
		android:clickable="true"
		android:background="?android:attr/selectableItemBackground">
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<FrameLayout
		android:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginEnd="16dp"
		android:layout_height="wrap_content"
		android:minWidth="56dp"
		android:orientation="horizontal"
		android:focusable="false"
		android:clickable="false">
		android:paddingEnd="12dp"
		android:paddingTop="16dp"
		android:paddingBottom="4dp">

		<CheckBox
		android:id="@+id/checkbox"
		<ImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:focusable="false"
		android:clickable="false"
		android:background="@null"/>
		android:layout_height="wrap_content" />

		</FrameLayout>

		@@ -94,7 +89,6 @@
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:contentDescription="@string/accessibility_shortcut_settings"
		android:gravity="end\|center_vertical"
		android:minWidth="58dp"
		android:orientation="vertical" />

res/layout/preference_widget_settings.xml

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License
		-->

		<!-- Layout used by ShortcutPreference. This is inflated inside android.R.layout.preference. -->
		<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/settings_button"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:background="?android:attr/selectableItemBackground"
		android:scaleType="center"
		android:src="@drawable/ic_mode_edit"
		android:contentDescription="@string/settings_button" />

src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import com.android.settingslib.accessibility.AccessibilityUtils;
		* {@link AccessibilityServiceInfo#FLAG_REQUEST_ACCESSIBILITY_BUTTON} is set.
		*/
		public class InvisibleToggleAccessibilityServicePreferenceFragment extends
		ToggleAccessibilityServicePreferenceFragment implements ShortcutPreference.OnClickListener{
		ToggleAccessibilityServicePreferenceFragment implements ShortcutPreference.OnClickCallback {

		@Override
		protected void onInstallSwitchPreferenceToggleSwitch() {
		@@ -47,10 +47,10 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends
		* accessibility service when shortcutPreference is unchecked.
		*/
		@Override
		public void onCheckboxClicked(ShortcutPreference preference) {
		super.onCheckboxClicked(preference);
		public void onToggleClicked(ShortcutPreference preference) {
		super.onToggleClicked(preference);
		boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED)
		&& preference.getChecked();
		&& preference.isChecked();

		AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, enabled);
		}
		@@ -61,8 +61,8 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends
		* Enables accessibility service when user clicks permission allow button.
		*/
		@Override
		void onDialogButtonFromShortcutClicked(View view) {
		super.onDialogButtonFromShortcutClicked(view);
		void onDialogButtonFromShortcutToggleClicked(View view) {
		super.onDialogButtonFromShortcutToggleClicked(view);
		if (view.getId() == R.id.permission_enable_allow_button) {
		AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName,
		true);

src/com/android/settings/accessibility/LegacyAccessibilityServicePreferenceFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public class LegacyAccessibilityServicePreferenceFragment extends
		final CharSequence hardwareTitle = getPrefContext().getText(
		R.string.accessibility_shortcut_edit_dialog_title_hardware);
		mShortcutPreference.setSummary(hardwareTitle);
		mShortcutPreference.setSettingsVisibility(View.GONE);
		mShortcutPreference.setSettingsEditable(false);

		setAllowedPreferredShortcutType(UserShortcutType.HARDWARE);
		}

src/com/android/settings/accessibility/ShortcutPreference.java

+66 −79

Original line number	Diff line number	Diff line
		@@ -18,9 +18,11 @@ package com.android.settings.accessibility;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.util.TypedValue;
		import android.view.MotionEvent;
		import android.view.View;
		import android.widget.CheckBox;
		import android.widget.LinearLayout;
		import android.widget.Switch;

		import androidx.preference.Preference;
		import androidx.preference.PreferenceViewHolder;
		@@ -34,77 +36,84 @@ import com.android.settings.R;
		public class ShortcutPreference extends Preference {

		/**
		* Interface definition for a callback to be invoked when the checkbox or settings has been
		* Interface definition for a callback to be invoked when the toggle or settings has been
		* clicked.
		*/
		public interface OnClickListener {
		public interface OnClickCallback {
		/**
		* Called when the checkbox in ShortcutPreference has been clicked.
		* Called when the settings view has been clicked.
		*
		* @param preference The clicked preference
		*/
		void onCheckboxClicked(ShortcutPreference preference);
		void onSettingsClicked(ShortcutPreference preference);

		/**
		* Called when the settings view has been clicked.
		* Called when the toggle in ShortcutPreference has been clicked.
		*
		* @param preference The clicked preference
		*/
		void onSettingsClicked(ShortcutPreference preference);
		void onToggleClicked(ShortcutPreference preference);
		}
		private OnClickListener mListener = null;

		private static final float DISABLED_ALPHA = 0.77f;
		private static final float ENABLED_ALPHA = 1.0f;
		private int mSettingsVisibility = View.VISIBLE;
		private boolean mAutoEnabledSettings;
		private OnClickCallback mClickCallback = null;
		private boolean mChecked = false;
		private boolean mSettingsEditable = true;

		ShortcutPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		init();
		setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
		setWidgetLayoutResource(R.layout.preference_widget_master_switch);
		setIconSpaceReserved(true);
		setSelectable(false);
		}

		@Override
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);

		final TypedValue outValue = new TypedValue();
		getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
		outValue, true);

		final LinearLayout mainFrame = holder.itemView.findViewById(R.id.main_frame);
		if (mainFrame != null) {
		mainFrame.setOnClickListener(view -> callOnCheckboxClicked());
		}

		final CheckBox checkBox = holder.itemView.findViewById(R.id.checkbox);
		if (checkBox != null) {
		checkBox.setChecked(mChecked);
		}


		final View settings = holder.itemView.findViewById(android.R.id.widget_frame);
		if (settings != null) {
		settings.setOnClickListener(view -> callOnSettingsClicked());
		settings.setEnabled(mAutoEnabledSettings ? mChecked : /* enabled */ true);

		float alpha;
		if (mAutoEnabledSettings) {
		alpha = mChecked ? ENABLED_ALPHA : DISABLED_ALPHA;
		} else {
		alpha = ENABLED_ALPHA;
		}

		settings.setAlpha(alpha);
		settings.setVisibility(mSettingsVisibility);
		mainFrame.setOnClickListener(view -> callOnSettingsClicked());
		mainFrame.setClickable(mSettingsEditable);
		mainFrame.setFocusable(mSettingsEditable);
		mainFrame.setBackgroundResource(
		mSettingsEditable ? outValue.resourceId : /* Remove background */ 0);
		}

		Switch switchWidget = holder.itemView.findViewById(R.id.switchWidget);
		if (switchWidget != null) {
		// Consumes move events to ignore drag actions.
		switchWidget.setOnTouchListener((v, event) -> {
		return event.getActionMasked() == MotionEvent.ACTION_MOVE;
		});
		switchWidget.setContentDescription(
		getContext().getText(R.string.accessibility_shortcut_settings));
		switchWidget.setChecked(mChecked);
		switchWidget.setOnClickListener(view -> callOnToggleClicked());
		switchWidget.setClickable(mSettingsEditable);
		switchWidget.setFocusable(mSettingsEditable);
		switchWidget.setBackgroundResource(
		mSettingsEditable ? outValue.resourceId : /* Remove background */ 0);
		}

		final View divider = holder.itemView.findViewById(R.id.divider);
		if (divider != null) {
		divider.setVisibility(mSettingsVisibility);
		divider.setVisibility(mSettingsEditable ? View.VISIBLE : View.GONE);
		}

		holder.itemView.setOnClickListener(view -> callOnToggleClicked());
		holder.itemView.setClickable(!mSettingsEditable);
		holder.itemView.setFocusable(!mSettingsEditable);
		}

		/**
		* Sets the shortcut checkbox according to checked value.
		* Sets the shortcut toggle according to checked value.
		*
		* @param checked the state value of shortcut checkbox
		* @param checked the state value of shortcut toggle
		*/
		public void setChecked(boolean checked) {
		if (mChecked != checked) {
		@@ -114,72 +123,50 @@ public class ShortcutPreference extends Preference {
		}

		/**
		* Gets the checked value of shortcut checkbox.
		* Gets the checked value of shortcut toggle.
		*
		* @return the checked value of shortcut checkbox
		* @return the checked value of shortcut toggle
		*/
		public boolean getChecked() {
		public boolean isChecked() {
		return mChecked;
		}

		/**
		* Automatically/Manually enable settings according to checkbox click status.
		*
		* Automatically enable settings means settings view enabled when checkbox is clicked, and
		* disabled when checkbox is not clicked.
		* Manually enable settings means settings view always enabled.
		*
		* @param autoEnabled True will automatically enable settings, false will let settings view
		* always enabled.
		* Sets the editable state of Settings view. If the view cannot edited, it makes the settings
		* and toggle be not touchable. The main ui handles touch event directly by {@link #onClick}.
		*/
		public void setAutoEnabledSettings(boolean autoEnabled) {
		if (mAutoEnabledSettings != autoEnabled) {
		mAutoEnabledSettings = autoEnabled;
		public void setSettingsEditable(boolean enabled) {
		if (mSettingsEditable != enabled) {
		mSettingsEditable = enabled;
		// Disable whole component to let each child component can be addressed.
		setSelectable(!mSettingsEditable);
		notifyChanged();
		}
		}

		/**
		* Sets the visibility state of Settings view.
		*
		* @param visibility one of {@link View#VISIBLE}, {@link View#INVISIBLE}, or {@link View#GONE}.
		*/
		public void setSettingsVisibility(@View.Visibility int visibility) {
		if (mSettingsVisibility != visibility) {
		mSettingsVisibility = visibility;
		notifyChanged();
		}
		public boolean isSettingsEditable() {
		return mSettingsEditable;
		}

		/**
		* Sets the callback to be invoked when this preference is clicked by the user.
		*
		* @param listener the callback to be invoked
		* @param callback the callback to be invoked
		*/
		public void setOnClickListener(OnClickListener listener) {
		mListener = listener;
		}

		private void init() {
		setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
		setWidgetLayoutResource(R.layout.preference_widget_settings);
		setIconSpaceReserved(false);
		mAutoEnabledSettings = true;

		// Disable whole component to let each child component can be addressed.
		setSelectable(false);
		public void setOnClickCallback(OnClickCallback callback) {
		mClickCallback = callback;
		}

		private void callOnSettingsClicked() {
		if (mListener != null) {
		mListener.onSettingsClicked(this);
		if (mClickCallback != null) {
		mClickCallback.onSettingsClicked(this);
		}
		}

		private void callOnCheckboxClicked() {
		private void callOnToggleClicked() {
		setChecked(!mChecked);
		if (mListener != null) {
		mListener.onCheckboxClicked(this);
		if (mClickCallback != null) {
		mClickCallback.onToggleClicked(this);
		}
		}
		}