summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/accessibility
diff options
context:
space:
mode:
authorHiroki Sato <hirokisato@google.com>2020-04-10 13:19:32 +0900
committerHiroki Sato <hirokisato@google.com>2020-04-10 16:00:57 +0900
commit0e75d475ec36d4a4aa42a4eef852b98a2ec43536 (patch)
treeeb511d276799682a0b8569bcc46b5a52633b777e /src/com/android/settings/accessibility
parentdf338dd65202a3d421e06251ae8477eb5e4de8b0 (diff)
downloadpackages_apps_Settings-0e75d475ec36d4a4aa42a4eef852b98a2ec43536.tar.gz
packages_apps_Settings-0e75d475ec36d4a4aa42a4eef852b98a2ec43536.tar.bz2
packages_apps_Settings-0e75d475ec36d4a4aa42a4eef852b98a2ec43536.zip
Hide Bluetooth, Reset, Accessibility Settings in ARC
This is an upstreaming change of http://ag/8541963 and http://ag/10296201 to hide some items from settings search. This CL also adds javadoc to some settings classes to fix pre-upload warnings. Bug: 153704887 Test: Manual. In ARC build, "bluetooth" and "accessibility" no longer shows related settings. Change-Id: Ic3e9217944251adbea1bdd67baf66d3a9e89583a
Diffstat (limited to 'src/com/android/settings/accessibility')
-rw-r--r--src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java3
-rw-r--r--src/com/android/settings/accessibility/AccessibilitySettings.java6
-rw-r--r--src/com/android/settings/accessibility/CaptionAppearanceFragment.java6
-rw-r--r--src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java6
-rw-r--r--src/com/android/settings/accessibility/CaptionPropertiesFragment.java6
-rw-r--r--src/com/android/settings/accessibility/MagnificationPreferenceFragment.java11
-rw-r--r--src/com/android/settings/accessibility/MagnificationSettingsFragment.java2
-rw-r--r--src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java2
-rw-r--r--src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java2
-rw-r--r--src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java3
-rw-r--r--src/com/android/settings/accessibility/VibrationSettings.java6
11 files changed, 22 insertions, 31 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
index 0550908f3f..1e2a2b47b8 100644
--- a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
@@ -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 {
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 1e3944eb1f..3b3c2c544c 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -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";
diff --git a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java b/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
index 394f50ab78..e87a531c95 100644
--- a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
+++ b/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
@@ -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";
diff --git a/src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java b/src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java
index 8e5c003189..a889b94de5 100644
--- a/src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java
+++ b/src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java
@@ -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";
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 43539fd276..40eb2cd7ef 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -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";
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index 4c7d2a4f14..0e6d3becc5 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -39,12 +39,11 @@ import com.android.settingslib.search.SearchIndexable;
import java.util.List;
-@SearchIndexable
+/** Settings fragment containing magnification preference. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public final class MagnificationPreferenceFragment extends DashboardFragment {
- @VisibleForTesting
- static final int ON = 1;
- @VisibleForTesting
- static final int OFF = 0;
+ @VisibleForTesting static final int ON = 1;
+ @VisibleForTesting static final int OFF = 0;
private static final String TAG = "MagnificationPreferenceFragment";
@@ -169,4 +168,4 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
return isApplicable(context.getResources());
}
};
-} \ No newline at end of file
+}
diff --git a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
index 0e766b4cf5..04e8036256 100644
--- a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
@@ -40,7 +40,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/** Settings page for magnification. */
-@SearchIndexable
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class MagnificationSettingsFragment extends DashboardFragment {
private static final String TAG = "MagnificationSettingsFragment";
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 5e09b2a78c..55c8bd2e80 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -43,7 +43,7 @@ import java.util.List;
* Fragment for preference screen for settings related to Automatically click after mouse stops
* feature.
*/
-@SearchIndexable
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class ToggleAutoclickPreferenceFragment extends DashboardFragment
implements ToggleAutoclickPreferenceController.OnChangeListener {
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index c0ad2ac235..31d6f14145 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -39,7 +39,7 @@ import java.util.ArrayList;
import java.util.List;
/** Settings page for color inversion. */
-@SearchIndexable
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 9b8b117651..5b9c55b3a9 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -44,7 +44,8 @@ import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
-@SearchIndexable
+/** Settings for daltonizer. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
implements DaltonizerRadioButtonPreferenceController.OnChangeListener {
diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java
index cfa70b6022..90ee11cf57 100644
--- a/src/com/android/settings/accessibility/VibrationSettings.java
+++ b/src/com/android/settings/accessibility/VibrationSettings.java
@@ -23,10 +23,8 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
-/**
- * Accessibility settings for the vibration.
- */
-@SearchIndexable
+/** Accessibility settings for the vibration. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class VibrationSettings extends DashboardFragment {
private static final String TAG = "VibrationSettings";