Merge "Mainline use cellSignalStrength instead"
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 27c67fd..edf9a7c 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -71,6 +71,7 @@
app:tabMode="fixed"
app:tabIndicatorColor="@*android:color/accent_device_default"
app:tabSelectedTextColor="@*android:color/accent_device_default"
+ app:tabTextAppearance="@style/TextAppearance.Tab"
app:tabTextColor="?android:attr/textColorSecondary"/>
<View
android:layout_width="match_parent"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8df986f..eb2b869 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1014,19 +1014,19 @@
<item>\?</item>
</string-array>
- <!-- Display color space adjustment modes for accessibility -->
- <string-array name="daltonizer_type_entries" translatable="false">
- <item>@string/daltonizer_mode_deuteranomaly</item>
- <item>@string/daltonizer_mode_protanomaly</item>
- <item>@string/daltonizer_mode_tritanomaly</item>
+ <!-- Keys for color space adjustment modes for accessibility -->
+ <string-array name="daltonizer_mode_keys" translatable="false">
+ <item>daltonizer_mode_deuteranomaly</item>
+ <item>daltonizer_mode_protanomaly</item>
+ <item>daltonizer_mode_tritanomaly</item>
</string-array>
<!-- Values for display color space adjustment modes for accessibility -->
- <string-array name="daltonizer_type_values" translatable="false">
+ <integer-array name="daltonizer_type_values" translatable="false">
<item>12</item>
<item>11</item>
<item>13</item>
- </string-array>
+ </integer-array>
<!-- Battery saver mode: allowable trigger threshold levels. -->
<integer-array name="battery_saver_trigger_values" translatable="false" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f468746..d9020e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4922,6 +4922,18 @@
<string name="enable_quick_setting">Show in Quick Settings</string>
<!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
<string name="daltonizer_type">Correction mode</string>
+ <!-- Title shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+ <string name="daltonizer_mode_deuteranomaly_title">Red-green</string>
+ <!-- Title shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+ <string name="daltonizer_mode_protanomaly_title">Green-red</string>
+ <!-- Title shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+ <string name="daltonizer_mode_tritanomaly_title">Blue-yellow</string>
+ <!-- Summary shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+ <string name="daltonizer_mode_deuteranomaly_summary">Deuteranomaly</string>
+ <!-- Summary shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+ <string name="daltonizer_mode_protanomaly_summary">Protanomaly</string>
+ <!-- Summary shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+ <string name="daltonizer_mode_tritanomaly_summary">Tritanomaly</string>
<!-- Subtitle for the accessibility preference to configure feature that performs click action soon after mouse/trackpad pointer stops moving, in case delay before click is extremely short. Placeholder will be set to the number of milliseconds to which the delay amounts. [CHAR LIMIT=NONE] -->
<plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay">
@@ -6034,11 +6046,6 @@
<!-- Message when there are no available device admin apps to display -->
<string name="no_device_admins">No device admin apps available</string>
- <!-- Title for personal device admin apps on the list [CHAR_LIMIT=25] -->
- <string name="personal_device_admin_title">Personal</string>
- <!-- Title for managed device admin apps on the list [CHAR_LIMIT=25] -->
- <string name="managed_device_admin_title">Work</string>
-
<!-- Message when there are no available trust agents to display -->
<string name="no_trust_agents">No available trust agents</string>
@@ -8882,10 +8889,6 @@
<string name="filter_enabled_apps">Installed apps</string>
<!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
<string name="filter_instant_apps">Instant apps</string>
- <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
- <string name="filter_personal_apps">Personal</string>
- <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
- <string name="filter_work_apps">Work</string>
<!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
<string name="filter_notif_all_apps">Apps: All</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 68fa764..4cbf2c3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -572,6 +572,10 @@
<item name="android:showDividers">middle</item>
</style>
+ <style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
+ <item name="android:textAllCaps">false</item>
+ </style>
+
<style name="AccessibilityDialogServiceIcon">
<item name="android:layout_width">36dp</item>
<item name="android:layout_height">36dp</item>
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 496c515..22e0510 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -18,19 +18,32 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="daltonizer_preference_screen"
+ android:persistent="false"
android:title="@string/accessibility_display_daltonizer_preference_title">
- <ListPreference
- android:entries="@array/daltonizer_type_entries"
- android:entryValues="@array/daltonizer_type_values"
- android:key="type"
- android:summary="%s"
- android:title="@string/daltonizer_type"
- android:icon="@drawable/ic_accessibility_illustration_colorblind" />
+ <com.android.settingslib.widget.RadioButtonPreference
+ android:key="daltonizer_mode_deuteranomaly"
+ android:persistent="false"
+ android:summary="@string/daltonizer_mode_deuteranomaly_summary"
+ android:title="@string/daltonizer_mode_deuteranomaly_title"
+ settings:allowDividerAbove="true" />
+
+ <com.android.settingslib.widget.RadioButtonPreference
+ android:key="daltonizer_mode_protanomaly"
+ android:persistent="false"
+ android:summary="@string/daltonizer_mode_protanomaly_summary"
+ android:title="@string/daltonizer_mode_protanomaly_title" />
+
+ <com.android.settingslib.widget.RadioButtonPreference
+ android:key="daltonizer_mode_tritanomaly"
+ android:persistent="false"
+ android:summary="@string/daltonizer_mode_tritanomaly_summary"
+ android:title="@string/daltonizer_mode_tritanomaly_title" />
<com.android.settingslib.widget.FooterPreference
android:key="daltonizer_footer"
- android:title="@string/accessibility_display_daltonizer_preference_subtitle"
+ android:persistent="false"
android:selectable="false"
- settings:searchable="false"/>
+ android:title="@string/accessibility_display_daltonizer_preference_subtitle"
+ settings:searchable="false" />
</PreferenceScreen>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index e13e820..a7b602c 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -18,68 +18,78 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="accessibility_settings_screen"
- android:title="@string/accessibility_settings"
- android:persistent="true">
+ android:persistent="false"
+ android:title="@string/accessibility_settings">
<Preference
- android:key="accessibility_shortcut_preference"
- android:title="@string/accessibility_global_gesture_preference_title"
android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
+ android:key="accessibility_shortcut_preference"
+ android:persistent="false"
+ android:title="@string/accessibility_global_gesture_preference_title"
settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
<PreferenceCategory
android:key="user_installed_services_category"
- android:title="@string/user_installed_services_category_title">
- </PreferenceCategory>
+ android:persistent="false"
+ android:title="@string/user_installed_services_category_title"/>
<PreferenceCategory
android:key="screen_reader_category"
+ android:persistent="false"
android:title="@string/screen_reader_category_title">
<Preference
- android:key="tts_settings_preference"
- android:title="@string/tts_settings_title"
android:fragment="com.android.settings.tts.TextToSpeechSettings"
+ android:key="tts_settings_preference"
+ android:persistent="false"
+ android:title="@string/tts_settings_title"
settings:controller="com.android.settings.language.TtsPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="display_category"
+ android:persistent="false"
android:title="@string/display_category_title">
<Preference
- android:key="font_size_preference_screen"
- android:title="@string/title_font_size"
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+ android:key="font_size_preference_screen"
+ android:persistent="false"
+ android:title="@string/title_font_size"
settings:controller="com.android.settings.display.FontSizePreferenceController"
settings:searchable="false"/>
- <com.android.settings.display.ScreenZoomPreference
- android:key="accessibility_settings_screen_zoom"
+ <com.android.settings.display.ScreenZoomPreference
android:fragment="com.android.settings.display.ScreenZoomSettings"
+ android:key="accessibility_settings_screen_zoom"
+ android:persistent="false"
android:title="@string/screen_zoom_title"
settings:searchable="false"/>
- <SwitchPreference
+ <SwitchPreference
android:key="dark_ui_mode_accessibility"
+ android:persistent="false"
android:title="@string/dark_ui_mode"
settings:controller="com.android.settings.display.DarkUIPreferenceController"
settings:searchable="false"/>
- <Preference
- android:key="magnification_preference_screen"
- android:title="@string/accessibility_screen_magnification_title"
- android:icon="@drawable/ic_accessibility_magnification"
+ <Preference
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
+ android:icon="@drawable/ic_accessibility_magnification"
+ android:key="magnification_preference_screen"
+ android:persistent="false"
+ android:title="@string/accessibility_screen_magnification_title"
settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
<SwitchPreference
android:key="toggle_large_pointer_icon"
+ android:persistent="false"
android:title="@string/accessibility_toggle_large_pointer_icon_title"
settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
<SwitchPreference
android:key="toggle_disable_animations"
+ android:persistent="false"
android:title="@string/accessibility_disable_animations"
settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
@@ -87,111 +97,124 @@
<PreferenceCategory
android:key="interaction_control_category"
+ android:persistent="false"
android:title="@string/interaction_control_category_title">
<Preference
- android:key="autoclick_preference"
- android:title="@string/accessibility_autoclick_preference_title"
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
+ android:key="autoclick_preference"
+ android:persistent="false"
+ android:title="@string/accessibility_autoclick_preference_title"
settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>
<SwitchPreference
android:key="toggle_power_button_ends_call_preference"
- android:title="@string/accessibility_power_button_ends_call_prerefence_title"
android:persistent="false"
+ android:title="@string/accessibility_power_button_ends_call_prerefence_title"
settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>
-
+
<SwitchPreference
android:key="toggle_lock_screen_rotation_preference"
- android:title="@string/accelerometer_title"
android:persistent="false"
+ android:title="@string/accelerometer_title"
settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
<ListPreference
- android:key="select_long_press_timeout_preference"
- android:title="@string/accessibility_long_press_timeout_preference_title"
android:entries="@array/long_press_timeout_selector_titles"
android:entryValues="@array/long_press_timeout_selector_values"
+ android:key="select_long_press_timeout_preference"
android:persistent="false"
+ android:title="@string/accessibility_long_press_timeout_preference_title"
settings:controller="com.android.settings.accessibility.SelectLongPressTimeoutPreferenceController"/>
<Preference
- android:key="accessibility_control_timeout_preference_fragment"
- android:title="@string/accessibility_setting_item_control_timeout_title"
- android:persistent="false"
android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
+ android:key="accessibility_control_timeout_preference_fragment"
+ android:persistent="false"
+ android:title="@string/accessibility_setting_item_control_timeout_title"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutPreferenceController"/>
<Preference
- android:key="vibration_preference_screen"
- android:title="@string/accessibility_vibration_settings_title"
android:fragment="com.android.settings.accessibility.VibrationSettings"
+ android:key="vibration_preference_screen"
+ android:persistent="false"
+ android:title="@string/accessibility_vibration_settings_title"
settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>
<Preference
- android:key="gesture_system_navigation_input_summary_accessibility"
- android:title="@string/system_navigation_title"
android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
- settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController" />
+ android:key="gesture_system_navigation_input_summary_accessibility"
+ android:persistent="false"
+ android:title="@string/system_navigation_title"
+ settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="audio_and_captions_category"
+ android:persistent="false"
android:title="@string/audio_and_captions_category_title">
<Preference
android:key="live_caption"
- android:title="@string/live_caption_title"
+ android:persistent="false"
android:summary="@string/live_caption_summary"
+ android:title="@string/live_caption_title"
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
<SwitchPreference
android:key="toggle_master_mono"
- android:title="@string/accessibility_toggle_master_mono_title"
- android:summary="@string/accessibility_toggle_master_mono_summary"
android:persistent="false"
+ android:summary="@string/accessibility_toggle_master_mono_summary"
+ android:title="@string/accessibility_toggle_master_mono_title"
settings:controller="com.android.settings.accessibility.MasterMonoPreferenceController"/>
<com.android.settings.accessibility.BalanceSeekBarPreference
android:key="seekbar_master_balance"
+ android:persistent="false"
android:title="@string/accessibility_toggle_master_balance_title"/>
<Preference
android:key="hearing_aid_preference"
+ android:persistent="false"
android:summary="@string/accessibility_hearingaid_not_connected_summary"
android:title="@string/accessibility_hearingaid_title"
settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
<Preference
- android:key="captioning_preference_screen"
- android:title="@string/accessibility_captioning_title"
android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
+ android:key="captioning_preference_screen"
+ android:persistent="false"
+ android:title="@string/accessibility_captioning_title"
settings:controller="com.android.settings.accessibility.CaptioningPreferenceController"/>
+
</PreferenceCategory>
<PreferenceCategory
android:key="experimental_category"
+ android:persistent="false"
android:title="@string/experimental_category_title">
<SwitchPreference
android:key="toggle_high_text_contrast_preference"
+ android:persistent="false"
android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
<Preference
- android:key="daltonizer_preference"
- android:title="@string/accessibility_display_daltonizer_preference_title"
- android:icon="@drawable/ic_daltonizer"
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
+ android:icon="@drawable/ic_daltonizer"
+ android:key="daltonizer_preference"
+ android:persistent="false"
+ android:title="@string/accessibility_display_daltonizer_preference_title"
settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
<SwitchPreference
- android:key="toggle_inversion_preference"
- android:title="@string/accessibility_display_inversion_preference_title"
- android:summary="@string/accessibility_display_inversion_preference_subtitle"
- android:persistent="false"
android:icon="@drawable/ic_color_inversion"
+ android:key="toggle_inversion_preference"
+ android:persistent="false"
+ android:summary="@string/accessibility_display_inversion_preference_subtitle"
+ android:title="@string/accessibility_display_inversion_preference_title"
settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index b5a1539..bef4f1b 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1060,9 +1060,9 @@
public static Fragment getTargetFragment(Activity activity, String fragmentName, Bundle args) {
Fragment f = null;
final boolean isPersonal = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
- == ProfileSelectFragment.PERSONAL : false;
+ == ProfileSelectFragment.ProfileType.PERSONAL : false;
final boolean isWork = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
- == ProfileSelectFragment.WORK : false;
+ == ProfileSelectFragment.ProfileType.WORK : false;
if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.PERSONAL_WORK_PROFILE)
&& UserManager.get(activity).getUserProfiles().size() > 1
&& ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName) != null
diff --git a/src/com/android/settings/accessibility/DaltonizerPreferenceController.java b/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
index c02a362..efdfaed 100644
--- a/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
+++ b/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
@@ -16,25 +16,143 @@
package com.android.settings.accessibility;
+import android.content.ContentResolver;
import android.content.Context;
+import android.content.res.Resources;
import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
-public class DaltonizerPreferenceController extends BasePreferenceController {
+import com.google.common.primitives.Ints;
- public DaltonizerPreferenceController(Context context, String preferenceKey) {
+import java.util.HashMap;
+import java.util.Map;
+
+/** Controller class that control accessibility daltonizer settings. */
+public class DaltonizerPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, RadioButtonPreference.OnClickListener {
+ private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
+
+ // pair the preference key and daltonizer value.
+ private final Map<String, Integer> mAccessibilityDaltonizerKeyToValueMap = new HashMap<>();
+
+ // RadioButtonPreference key, each preference represent a daltonizer value.
+ private final ContentResolver mContentResolver;
+ private final Resources mResources;
+ private DaltonizerPreferenceController.OnChangeListener mOnChangeListener;
+ private RadioButtonPreference mPreference;
+ private int mAccessibilityDaltonizerValue;
+
+ public DaltonizerPreferenceController(Context context, Lifecycle lifecycle,
+ String preferenceKey) {
super(context, preferenceKey);
+
+ mContentResolver = context.getContentResolver();
+ mResources = context.getResources();
+
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ }
+ }
+
+ protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver,
+ String name) {
+ final String daltonizerStringValue = Settings.Secure.getString(resolver, name);
+ if (daltonizerStringValue == null) {
+ return AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
+ }
+ final Integer daltonizerIntValue = Ints.tryParse(daltonizerStringValue);
+ return daltonizerIntValue == null ? AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY
+ : daltonizerIntValue;
+ }
+
+ public void setOnChangeListener(DaltonizerPreferenceController.OnChangeListener listener) {
+ mOnChangeListener = listener;
+ }
+
+ private Map<String, Integer> getDaltonizerValueToKeyMap() {
+ if (mAccessibilityDaltonizerKeyToValueMap.size() == 0) {
+
+ final String[] daltonizerKeys = mResources.getStringArray(
+ R.array.daltonizer_mode_keys);
+
+ final int[] daltonizerValues = mResources.getIntArray(
+ R.array.daltonizer_type_values);
+
+ final int daltonizerValueCount = daltonizerValues.length;
+ for (int i = 0; i < daltonizerValueCount; i++) {
+ mAccessibilityDaltonizerKeyToValueMap.put(daltonizerKeys[i], daltonizerValues[i]);
+ }
+ }
+ return mAccessibilityDaltonizerKeyToValueMap;
+ }
+
+ private void putSecureString(String name, String value) {
+ Settings.Secure.putString(mContentResolver, name, value);
+ }
+
+ private void handlePreferenceChange(String value) {
+ putSecureString(TYPE, value);
}
@Override
public int getAvailabilityStatus() {
- return AVAILABLE_UNSEARCHABLE;
+ return AVAILABLE;
}
@Override
- public CharSequence getSummary() {
- return AccessibilityUtil.getSummary(mContext,
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (RadioButtonPreference)
+ screen.findPreference(getPreferenceKey());
+ mPreference.setOnClickListener(this);
+ updateState(mPreference);
}
+
+ @Override
+ public void onRadioButtonClicked(RadioButtonPreference preference) {
+ final int value = getDaltonizerValueToKeyMap().get(mPreferenceKey);
+ handlePreferenceChange(String.valueOf(value));
+ if (mOnChangeListener != null) {
+ mOnChangeListener.onCheckedChanged(mPreference);
+ }
+ }
+
+ private int getAccessibilityDaltonizerValue() {
+ final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver,
+ TYPE);
+ return daltonizerValue;
+ }
+
+ protected void updatePreferenceCheckedState(int value) {
+ if (mAccessibilityDaltonizerValue == value) {
+ mPreference.setChecked(true);
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ mAccessibilityDaltonizerValue = getAccessibilityDaltonizerValue();
+
+ // reset RadioButton
+ mPreference.setChecked(false);
+ final int preferenceValue = getDaltonizerValueToKeyMap().get(mPreference.getKey());
+ updatePreferenceCheckedState(preferenceValue);
+ }
+
+ /** Listener interface handles checked event. */
+ public interface OnChangeListener {
+ /** A hook that is called when preference checked.*/
+ void onCheckedChanged(Preference preference);
+ }
+
}
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index e02a74a..f127b53 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -18,34 +18,56 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.hardware.display.ColorDisplayManager;
-import android.os.Bundle;
-import android.provider.SearchIndexableResource;
+import android.content.res.Resources;
import android.provider.Settings;
-import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
-import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
-public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
- implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
- private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
- private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
- private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
- private static final String KEY_DALTONIZER_FOOTER = "daltonizer_footer";
+public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
+ implements DaltonizerPreferenceController.OnChangeListener,
+ SwitchBar.OnSwitchChangeListener {
- private ListPreference mType;
+ private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
+
+ private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
+
+ @Override
+ public void onCheckedChanged(Preference preference) {
+ for (AbstractPreferenceController controller : sControllers) {
+ controller.updateState(preference);
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ for (AbstractPreferenceController controller :
+ buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
+ ((DaltonizerPreferenceController) controller).setOnChangeListener(this);
+ ((DaltonizerPreferenceController) controller).displayPreference(getPreferenceScreen());
+ }
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ for (AbstractPreferenceController controller :
+ buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
+ ((DaltonizerPreferenceController) controller).setOnChangeListener(null);
+ }
+ }
@Override
public int getMetricsCategory() {
@@ -57,16 +79,6 @@
return R.string.help_url_color_correction;
}
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- mType = (ListPreference) findPreference("type");
-
- final Preference footer = findPreference(KEY_DALTONIZER_FOOTER);
- footer.setVisible(!ColorDisplayManager.isColorTransformAccelerated(getActivity()));
- initPreferences();
- }
@Override
protected int getPreferenceScreenResId() {
@@ -75,26 +87,7 @@
@Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
- Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 1 : 0);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mType) {
- Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue));
- preference.setSummary("%s");
- }
-
- return true;
- }
-
- @Override
- protected void onInstallSwitchBarToggleSwitch() {
- super.onInstallSwitchBarToggleSwitch();
-
- mSwitchBar.setCheckedInternal(
- Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
- mSwitchBar.addOnSwitchChangeListener(this);
+ Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 0 : 1);
}
@Override
@@ -110,25 +103,34 @@
switchBar.setSwitchBarText(switchBarText, switchBarText);
}
- private void initPreferences() {
- final String value = Integer.toString(
- Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE));
- mType.setValue(value);
- mType.setOnPreferenceChangeListener(this);
- final int index = mType.findIndexOfValue(value);
- if (index < 0) {
- // We're using a mode controlled by developer preferences.
- mType.setSummary(getString(R.string.daltonizer_type_overridden,
- getString(R.string.simulate_color_space)));
- }
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ Settings.Secure.putInt(getContentResolver(), ENABLED, isChecked ? 1 : 0);
}
@Override
- public void onSwitchChanged(Switch switchView, boolean isChecked) {
- onPreferenceToggled(mPreferenceKey, isChecked);
+ protected void onInstallSwitchBarToggleSwitch() {
+ super.onInstallSwitchBarToggleSwitch();
+ mSwitchBar.setCheckedInternal(
+ Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
+ mSwitchBar.addOnSwitchChangeListener(this);
+ }
+
+ private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+ Lifecycle lifecycle) {
+ if (sControllers.size() == 0) {
+ final Resources resources = context.getResources();
+ final String[] daltonizerKeys = resources.getStringArray(
+ R.array.daltonizer_mode_keys);
+
+ for (int i = 0; i < daltonizerKeys.length; i++) {
+ sControllers.add(new DaltonizerPreferenceController(
+ context, lifecycle, daltonizerKeys[i]));
+ }
+ }
+ return sControllers;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings);
-
}
diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
index bee9071..53b5ea3 100644
--- a/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -73,7 +73,7 @@
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities,
- ProfileSelectFragment.ALL);
+ ProfileSelectFragment.ProfileType.ALL);
if (parent != null) {
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
diff --git a/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java b/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
index e0db7f5..f29326e 100644
--- a/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
@@ -71,7 +71,7 @@
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities,
- ProfileSelectFragment.PERSONAL);
+ ProfileSelectFragment.ProfileType.PERSONAL);
if (parent != null) {
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 36a7012..1f27963 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -277,10 +277,10 @@
final int profilesCount = profiles.size();
for (int i = 0; i < profilesCount; i++) {
if (profiles.get(i).isManagedProfile()
- && (mType & ProfileSelectFragment.WORK) != 0) {
+ && (mType & ProfileSelectFragment.ProfileType.WORK) != 0) {
updateProfileUi(profiles.get(i));
} else if (!profiles.get(i).isManagedProfile()
- && (mType & ProfileSelectFragment.PERSONAL) != 0) {
+ && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {
updateProfileUi(profiles.get(i));
}
}
@@ -324,7 +324,7 @@
preferenceGroup.setContentDescription(
mContext.getString(R.string.account_settings));
} else if (userInfo.isManagedProfile()) {
- if (mType == ProfileSelectFragment.ALL) {
+ if (mType == ProfileSelectFragment.ProfileType.ALL) {
preferenceGroup.setTitle(R.string.category_work);
final String workGroupSummary = getWorkGroupSummary(context, userInfo);
preferenceGroup.setSummary(workGroupSummary);
@@ -336,7 +336,7 @@
DISALLOW_REMOVE_MANAGED_PROFILE, UserHandle.myUserId());
profileData.managedProfilePreference = newManagedProfileSettings();
} else {
- if (mType == ProfileSelectFragment.ALL) {
+ if (mType == ProfileSelectFragment.ProfileType.ALL) {
preferenceGroup.setTitle(R.string.category_personal);
preferenceGroup.setContentDescription(
mContext.getString(R.string.accessibility_category_personal));
diff --git a/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java b/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
index 8dfa934..853c66b 100644
--- a/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
@@ -71,7 +71,7 @@
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities,
- ProfileSelectFragment.WORK);
+ ProfileSelectFragment.ProfileType.WORK);
if (parent != null) {
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 0d2bcab..250dce0 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -136,13 +136,13 @@
mFilters[FILTER_APPS_PERSONAL] = new AppFilterItem(
ApplicationsState.FILTER_PERSONAL,
FILTER_APPS_PERSONAL,
- R.string.filter_personal_apps);
+ R.string.category_personal);
// Work
mFilters[FILTER_APPS_WORK] = new AppFilterItem(
ApplicationsState.FILTER_WORK,
FILTER_APPS_WORK,
- R.string.filter_work_apps);
+ R.string.category_work);
// Usage access screen, never displayed.
mFilters[FILTER_APPS_USAGE_ACCESS] = new AppFilterItem(
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 4ce8fa4..7da89e4 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -102,9 +102,9 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.fuelgauge.HighPowerDetail;
-import com.android.settings.notification.app.AppNotificationSettings;
import com.android.settings.notification.ConfigureNotificationSettings;
import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.AppNotificationSettings;
import com.android.settings.widget.LoadingViewController;
import com.android.settings.wifi.AppStateChangeWifiStateBridge;
import com.android.settings.wifi.ChangeWifiStateDetails;
@@ -311,9 +311,9 @@
final AppFilterRegistry appFilterRegistry = AppFilterRegistry.getInstance();
mFilter = appFilterRegistry.get(appFilterRegistry.getDefaultFilterType(mListType));
mIsPersonalOnly = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
- == ProfileSelectFragment.PERSONAL : false;
+ == ProfileSelectFragment.ProfileType.PERSONAL : false;
mIsWorkOnly = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
- == ProfileSelectFragment.WORK : false;
+ == ProfileSelectFragment.ProfileType.WORK : false;
mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : NO_USER_SPECIFIED;
mExpandSearch = activity.getIntent().getBooleanExtra(EXTRA_EXPAND_SEARCH_VIEW, false);
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index de23ec0..79228c2 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -53,26 +53,29 @@
* Denotes the profile type.
*/
@Retention(RetentionPolicy.SOURCE)
- @IntDef({PERSONAL, WORK, ALL})
+ @IntDef({
+ ProfileType.PERSONAL,
+ ProfileType.WORK,
+ ProfileType.ALL
+ })
public @interface ProfileType {
+ /**
+ * It is personal work profile.
+ */
+ int PERSONAL = 1;
+
+ /**
+ * It is work profile
+ */
+ int WORK = 1 << 1;
+
+ /**
+ * It is personal and work profile
+ */
+ int ALL = PERSONAL | WORK;
}
/**
- * It is personal work profile.
- */
- public static final int PERSONAL = 1;
-
- /**
- * It is work profile
- */
- public static final int WORK = 1 << 1;
-
- /**
- * It is personal and work profile
- */
- public static final int ALL = PERSONAL | WORK;
-
- /**
* Used in fragment argument and pass {@link ProfileType} to it
*/
public static final String EXTRA_PROFILE = "profile";
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java
index a448f57..17fed11 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java
@@ -30,12 +30,12 @@
@Override
public Fragment[] getFragments() {
final Bundle workOnly = getArguments() != null ? getArguments().deepCopy() : new Bundle();
- workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.WORK);
+ workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.WORK);
final Fragment workFragment = new ManageApplications();
workFragment.setArguments(workOnly);
final Bundle personalOnly = getArguments() != null ? getArguments() : new Bundle();
- personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.PERSONAL);
+ personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
final Fragment personalFragment = new ManageApplications();
personalFragment.setArguments(personalOnly);
return new Fragment[]{
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
index c204ad4..bb39cdb 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
@@ -37,7 +37,7 @@
final Bundle storageBundle = new Bundle();
storageBundle.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
- storageBundle.putInt(EXTRA_PROFILE, ProfileSelectFragment.PERSONAL);
+ storageBundle.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
final Fragment storageDashboardFragment = new StorageDashboardFragment();
storageDashboardFragment.setArguments(storageBundle);
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index b36ad43..bbd87ab 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -87,7 +87,7 @@
StorageManager sm = activity.getSystemService(StorageManager.class);
mVolume = Utils.maybeInitializeVolume(sm, getArguments());
mPersonalOnly = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE)
- == ProfileSelectFragment.PERSONAL;
+ == ProfileSelectFragment.ProfileType.PERSONAL;
if (mVolume == null) {
activity.finish();
return;
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 164eca7..1f58ea9 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -405,7 +405,8 @@
} else {
final Bundle args = new Bundle(2 + additionalCapacity);
args.putInt(ProfileSelectFragment.EXTRA_PROFILE,
- mIsWorkProfile ? ProfileSelectFragment.WORK : ProfileSelectFragment.ALL);
+ mIsWorkProfile ? ProfileSelectFragment.ProfileType.WORK
+ : ProfileSelectFragment.ProfileType.ALL);
args.putInt(ManageApplications.EXTRA_WORK_ID, mUserId);
return args;
}
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index e3136f4..c878058 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -128,9 +128,9 @@
final PreferenceCategory category = new PreferenceCategory(prefContext);
screen.addPreference(category);
if (userInfo.isManagedProfile()) {
- category.setTitle(R.string.managed_device_admin_title);
+ category.setTitle(R.string.category_work);
} else {
- category.setTitle(R.string.personal_device_admin_title);
+ category.setTitle(R.string.category_personal);
}
category.setOrder(i);
createPreferences(prefContext, category, mApps.get(i));
diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java
index d4def6b..3b23daa 100644
--- a/src/com/android/settings/security/SimLockPreferenceController.java
+++ b/src/com/android/settings/security/SimLockPreferenceController.java
@@ -38,7 +38,7 @@
private final CarrierConfigManager mCarrierConfigManager;
private final UserManager mUserManager;
private final SubscriptionManager mSubscriptionManager;
- private final TelephonyManager mTelephonyManager;
+ private TelephonyManager mTelephonyManager;
public SimLockPreferenceController(Context context) {
super(context, KEY_SIM_LOCK);
@@ -99,7 +99,9 @@
if (subInfoList != null) {
for (SubscriptionInfo subInfo : subInfoList) {
- if (mTelephonyManager.hasIccCard(subInfo.getSimSlotIndex())) {
+ mTelephonyManager = mTelephonyManager
+ .createForSubscriptionId(subInfo.getSimSlotIndex());
+ if (mTelephonyManager.hasIccCard()) {
return true;
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
index e236cd4..86520a8 100644
--- a/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
@@ -18,53 +18,100 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
-public class DaltonizerPreferenceControllerTest {
- private static final int ON = 1;
- private static final int OFF = 0;
+public class DaltonizerPreferenceControllerTest implements
+ DaltonizerPreferenceController.OnChangeListener {
+ private static final String PREF_KEY = "daltonizer_mode_protanomaly";
+ private static final String PREF_VALUE = "11";
+ private static final String PREF_FAKE_VALUE = "-1";
- private Context mContext;
private DaltonizerPreferenceController mController;
+ @Mock
+ private RadioButtonPreference mMockPref;
+ private Context mContext;
+ private ContentResolver mContentResolver;
+
+ @Mock
+ private PreferenceScreen mScreen;
+
@Before
public void setUp() {
+ MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new DaltonizerPreferenceController(mContext, "color_correction");
+ mController = new DaltonizerPreferenceController(mContext, mock(Lifecycle.class), PREF_KEY);
+ mController.setOnChangeListener(this);
+ mContentResolver = mContext.getContentResolver();
+
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
+ when(mMockPref.getKey()).thenReturn(PREF_KEY);
+ mController.displayPreference(mScreen);
+ }
+
+ @Override
+ public void onCheckedChanged(Preference preference) {
+ mController.updateState(preference);
}
@Test
- public void getAvailabilityStatus_shouldReturnAvailableUnsearchable() {
- assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ public void isAvailable() {
+ assertThat(mController.isAvailable()).isTrue();
}
@Test
- public void getSummary_enabledColorCorrection_shouldReturnOnSummary() {
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, ON);
+ public void updateState_notChecked() {
+ Settings.Secure.putString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_FAKE_VALUE);
- assertThat(mController.getSummary())
- .isEqualTo(mContext.getText(R.string.accessibility_feature_state_on));
+ mController.updateState(mMockPref);
+
+ // the first checked state is set to false by control
+ verify(mMockPref, atLeastOnce()).setChecked(false);
+ verify(mMockPref, never()).setChecked(true);
}
@Test
- public void getSummary_disabledColorCorrection_shouldReturnOffSummary() {
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF);
+ public void updateState_checked() {
+ Settings.Secure.putString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_VALUE);
- assertThat(mController.getSummary())
- .isEqualTo(mContext.getText(R.string.accessibility_feature_state_off));
+ mController.updateState(mMockPref);
+
+ // the first checked state is set to false by control
+ verify(mMockPref, atLeastOnce()).setChecked(false);
+ verify(mMockPref, atLeastOnce()).setChecked(true);
+ }
+
+ @Test
+ public void onRadioButtonClick_shouldReturnDaltonizerValue() {
+ mController.onRadioButtonClicked(mMockPref);
+ final String accessibilityDaltonizerValue = Settings.Secure.getString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER);
+
+ assertThat(accessibilityDaltonizerValue).isEqualTo(PREF_VALUE);
}
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index d4a855f..65395a0 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -98,7 +98,7 @@
.thenReturn(new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
mController = new AccountPreferenceController(mContext, mFragment, null, mAccountHelper,
- ProfileSelectFragment.ALL);
+ ProfileSelectFragment.ProfileType.ALL);
}
@After
diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index 0ae33a0..ebafceb 100644
--- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
@@ -141,7 +141,8 @@
final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
SubscriptionInfo info = mock(SubscriptionInfo.class);
subscriptionInfoList.add(info);
- when(mTelephonyManager.hasIccCard(anyInt())).thenReturn(true);
+ when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+ when(mTelephonyManager.hasIccCard()).thenReturn(true);
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true)))
.thenReturn(subscriptionInfoList);
}