Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 545f08e8 authored Apr 13, 2020 by TreeHugger Robot Committed by Android (Google) Code Review Apr 13, 2020

Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev

parents 99eeb003 0e75d475

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,8 @@ import com.android.settingslib.search.SearchIndexable;
		import java.util.ArrayList;
		import java.util.List;

		@SearchIndexable
		/** Settings fragment containing accessibility control timeout preference. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public final class AccessibilityControlTimeoutPreferenceFragment extends DashboardFragment
		implements AccessibilityTimeoutController.OnChangeListener {

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -65,10 +65,8 @@ import java.util.List;
		import java.util.Map;
		import java.util.Set;

		/**
		* Activity with the accessibility settings.
		*/
		@SearchIndexable
		/** Activity with the accessibility settings. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class AccessibilitySettings extends DashboardFragment {

		private static final String TAG = "AccessibilitySettings";

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -44,10 +44,8 @@ import java.util.ArrayList;
		import java.util.List;
		import java.util.Locale;

		/**
		* Settings fragment containing font style of captioning properties.
		*/
		@SearchIndexable
		/** Settings fragment containing font style of captioning properties. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class CaptionAppearanceFragment extends SettingsPreferenceFragment
		implements OnPreferenceChangeListener, OnValueChangedListener {
		private static final String PREF_CAPTION_PREVIEW = "caption_preview";

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -30,10 +30,8 @@ import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.search.SearchIndexable;

		/**
		* Settings fragment containing more options of captioning properties.
		*/
		@SearchIndexable
		/** Settings fragment containing more options of captioning properties. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class CaptionMoreOptionsFragment extends SettingsPreferenceFragment
		implements Preference.OnPreferenceChangeListener {
		private static final String PREF_LOCALE = "captioning_locale";

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -37,10 +37,8 @@ import com.google.common.primitives.Floats;
		import java.util.ArrayList;
		import java.util.List;

		/**
		* Settings fragment containing captioning properties.
		*/
		@SearchIndexable
		/** Settings fragment containing captioning properties. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class CaptionPropertiesFragment extends SettingsPreferenceFragment
		implements OnPreferenceChangeListener {
		private static final String PREF_SWITCH = "captioning_preference_switch";