diff options
Diffstat (limited to 'src/com/android/settings')
40 files changed, 260 insertions, 259 deletions
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java index edbccc3fb..7c269238e 100644 --- a/src/com/android/settings/ActivityPicker.java +++ b/src/com/android/settings/ActivityPicker.java @@ -159,7 +159,7 @@ public class ActivityPicker extends AlertActivity implements Resources res = packageManager.getResourcesForApplication( iconResource.packageName); icon = res.getDrawable(res.getIdentifier( - iconResource.resourceName, null, null)); + iconResource.resourceName, null, null), null); } catch (NameNotFoundException e) { // Ignore } diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 4ce519887..5b8ad0d9e 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -23,7 +23,6 @@ import android.os.Handler; import android.os.Message; import android.os.SystemProperties; import android.os.UserHandle; -import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.SwitchPreference; import android.provider.Settings; @@ -59,12 +58,12 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene } }; - public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeCheckBoxPreference) { + public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeSwitchPreference) { mContext = context; - mSwitchPref = airplaneModeCheckBoxPreference; - - airplaneModeCheckBoxPreference.setPersistent(false); + mSwitchPref = airplaneModeSwitchPreference; + + airplaneModeSwitchPreference.setPersistent(false); mPhoneStateReceiver = new PhoneStateIntentReceiver(mContext, mHandler); mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED); diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 8cfee921a..6d88c5077 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -32,6 +32,7 @@ import android.preference.ListPreference; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceActivity; +import android.preference.SwitchPreference; import android.provider.Telephony; import android.telephony.TelephonyManager; import android.util.Log; @@ -81,7 +82,7 @@ public class ApnEditor extends PreferenceActivity private EditTextPreference mApnType; private ListPreference mProtocol; private ListPreference mRoamingProtocol; - private CheckBoxPreference mCarrierEnabled; + private SwitchPreference mCarrierEnabled; private ListPreference mBearer; private ListPreference mMvnoType; private EditTextPreference mMvnoMatchData; @@ -177,7 +178,7 @@ public class ApnEditor extends PreferenceActivity mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL); mRoamingProtocol.setOnPreferenceChangeListener(this); - mCarrierEnabled = (CheckBoxPreference) findPreference(KEY_CARRIER_ENABLED); + mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED); mBearer = (ListPreference) findPreference(KEY_BEARER); mBearer.setOnPreferenceChangeListener(this); diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index adc1b2d87..e552455e2 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -443,8 +443,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList try { final IMountService service = getMountService(); type = service.getPasswordType(); - owner_info = service.getField("OwnerInfo"); - pattern_visible = !("0".equals(service.getField("PatternVisible"))); + owner_info = service.getField(StorageManager.OWNER_INFO_KEY); + pattern_visible = !("0".equals(service.getField(StorageManager.PATTERN_VISIBLE_KEY))); } catch (Exception e) { Log.e(TAG, "Error calling mount service " + e); } diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 8eb9c525f..f34008df7 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -29,10 +29,10 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; import android.text.BidiFormatter; @@ -69,10 +69,10 @@ public class DateTimeSettings extends SettingsPreferenceFragment // have we been launched from the setup wizard? protected static final String EXTRA_IS_FIRST_RUN = "firstRun"; - private CheckBoxPreference mAutoTimePref; + private SwitchPreference mAutoTimePref; private Preference mTimePref; private Preference mTime24Pref; - private CheckBoxPreference mAutoTimeZonePref; + private SwitchPreference mAutoTimeZonePref; private Preference mTimeZone; private Preference mDatePref; private ListPreference mDateFormat; @@ -90,7 +90,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME); boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE); - mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME); + mAutoTimePref = (SwitchPreference) findPreference(KEY_AUTO_TIME); DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context .DEVICE_POLICY_SERVICE); @@ -108,7 +108,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment mDummyDate = Calendar.getInstance(); mAutoTimePref.setChecked(autoTimeEnabled); - mAutoTimeZonePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME_ZONE); + mAutoTimeZonePref = (SwitchPreference) findPreference(KEY_AUTO_TIME_ZONE); // Override auto-timezone if it's a wifi-only device or if we're still in setup wizard. // TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location. if (Utils.isWifiOnly(getActivity()) || isFirstRun) { @@ -168,7 +168,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment getPreferenceScreen().getSharedPreferences() .registerOnSharedPreferenceChangeListener(this); - ((CheckBoxPreference)mTime24Pref).setChecked(is24Hour()); + ((SwitchPreference)mTime24Pref).setChecked(is24Hour()); // Register for time ticks and other reasons for time change IntentFilter filter = new IntentFilter(); @@ -318,7 +318,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment removeDialog(DIALOG_TIMEPICKER); showDialog(DIALOG_TIMEPICKER); } else if (preference == mTime24Pref) { - final boolean is24Hour = ((CheckBoxPreference)mTime24Pref).isChecked(); + final boolean is24Hour = ((SwitchPreference)mTime24Pref).isChecked(); set24Hour(is24Hour); updateTimeAndDateDisplay(getActivity()); timeUpdated(is24Hour); diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index f5704c1b9..d410366c9 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -45,12 +45,12 @@ import android.os.StrictMode; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.text.TextUtils; @@ -65,7 +65,6 @@ import android.widget.TextView; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; -import dalvik.system.VMRuntime; import java.util.ArrayList; import java.util.Arrays; @@ -176,39 +175,39 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private boolean mHaveDebugSettings; private boolean mDontPokeProperties; - private CheckBoxPreference mEnableAdb; + private SwitchPreference mEnableAdb; private Preference mClearAdbKeys; - private CheckBoxPreference mEnableTerminal; + private SwitchPreference mEnableTerminal; private Preference mBugreport; - private CheckBoxPreference mBugreportInPower; - private CheckBoxPreference mKeepScreenOn; - private CheckBoxPreference mBtHciSnoopLog; - private CheckBoxPreference mEnableOemUnlock; - private CheckBoxPreference mAllowMockLocation; - private CheckBoxPreference mDebugViewAttributes; + private SwitchPreference mBugreportInPower; + private SwitchPreference mKeepScreenOn; + private SwitchPreference mBtHciSnoopLog; + private SwitchPreference mEnableOemUnlock; + private SwitchPreference mAllowMockLocation; + private SwitchPreference mDebugViewAttributes; private PreferenceScreen mPassword; private String mDebugApp; private Preference mDebugAppPref; - private CheckBoxPreference mWaitForDebugger; - private CheckBoxPreference mVerifyAppsOverUsb; - private CheckBoxPreference mWifiDisplayCertification; - private CheckBoxPreference mWifiVerboseLogging; - private CheckBoxPreference mWifiAggressiveHandover; - - private CheckBoxPreference mWifiAllowScansWithTraffic; - private CheckBoxPreference mStrictMode; - private CheckBoxPreference mPointerLocation; - private CheckBoxPreference mShowTouches; - private CheckBoxPreference mShowScreenUpdates; - private CheckBoxPreference mDisableOverlays; - private CheckBoxPreference mShowCpuUsage; - private CheckBoxPreference mForceHardwareUi; - private CheckBoxPreference mForceMsaa; - private CheckBoxPreference mShowHwScreenUpdates; - private CheckBoxPreference mShowHwLayersUpdates; - private CheckBoxPreference mDebugLayout; - private CheckBoxPreference mForceRtlLayout; + private SwitchPreference mWaitForDebugger; + private SwitchPreference mVerifyAppsOverUsb; + private SwitchPreference mWifiDisplayCertification; + private SwitchPreference mWifiVerboseLogging; + private SwitchPreference mWifiAggressiveHandover; + + private SwitchPreference mWifiAllowScansWithTraffic; + private SwitchPreference mStrictMode; + private SwitchPreference mPointerLocation; + private SwitchPreference mShowTouches; + private SwitchPreference mShowScreenUpdates; + private SwitchPreference mDisableOverlays; + private SwitchPreference mShowCpuUsage; + private SwitchPreference mForceHardwareUi; + private SwitchPreference mForceMsaa; + private SwitchPreference mShowHwScreenUpdates; + private SwitchPreference mShowHwLayersUpdates; + private SwitchPreference mDebugLayout; + private SwitchPreference mForceRtlLayout; private ListPreference mDebugHwOverdraw; private ListPreference mLogdSize; private ListPreference mTrackFrameTime; @@ -221,19 +220,19 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private ListPreference mSimulateColorSpace; - private CheckBoxPreference mUseNuplayer; - private CheckBoxPreference mUSBAudio; - private CheckBoxPreference mImmediatelyDestroyActivities; + private SwitchPreference mUseNuplayer; + private SwitchPreference mUSBAudio; + private SwitchPreference mImmediatelyDestroyActivities; private ListPreference mAppProcessLimit; - private CheckBoxPreference mShowAllANRs; + private SwitchPreference mShowAllANRs; private PreferenceScreen mProcessStats; private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>(); - private final ArrayList<CheckBoxPreference> mResetCbPrefs - = new ArrayList<CheckBoxPreference>(); + private final ArrayList<SwitchPreference> mResetSwitchPrefs + = new ArrayList<SwitchPreference>(); private final HashSet<Preference> mDisabledPrefs = new HashSet<Preference>(); // To track whether a confirmation dialog was clicked. @@ -268,7 +267,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment final PreferenceGroup debugDebuggingCategory = (PreferenceGroup) findPreference(DEBUG_DEBUGGING_CATEGORY_KEY); - mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB); + mEnableAdb = findAndInitSwitchPref(ENABLE_ADB); mClearAdbKeys = findPreference(CLEAR_ADB_KEYS); if (!SystemProperties.getBoolean("ro.adb.secure", false)) { if (debugDebuggingCategory != null) { @@ -276,23 +275,23 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } } mAllPrefs.add(mClearAdbKeys); - mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL); + mEnableTerminal = findAndInitSwitchPref(ENABLE_TERMINAL); if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) { debugDebuggingCategory.removePreference(mEnableTerminal); mEnableTerminal = null; } mBugreport = findPreference(BUGREPORT); - mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY); - mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON); - mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG); - mEnableOemUnlock = findAndInitCheckboxPref(ENABLE_OEM_UNLOCK); + mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY); + mKeepScreenOn = findAndInitSwitchPref(KEEP_SCREEN_ON); + mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG); + mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK); if (!showEnableOemUnlockPreference()) { removePreference(mEnableOemUnlock); mEnableOemUnlock = null; } - mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION); - mDebugViewAttributes = findAndInitCheckboxPref(DEBUG_VIEW_ATTRIBUTES); + mAllowMockLocation = findAndInitSwitchPref(ALLOW_MOCK_LOCATION); + mDebugViewAttributes = findAndInitSwitchPref(DEBUG_VIEW_ATTRIBUTES); mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD); mAllPrefs.add(mPassword); @@ -306,8 +305,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mDebugAppPref = findPreference(DEBUG_APP_KEY); mAllPrefs.add(mDebugAppPref); - mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY); - mVerifyAppsOverUsb = findAndInitCheckboxPref(VERIFY_APPS_OVER_USB_KEY); + mWaitForDebugger = findAndInitSwitchPref(WAIT_FOR_DEBUGGER_KEY); + mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY); if (!showVerifierSetting()) { if (debugDebuggingCategory != null) { debugDebuggingCategory.removePreference(mVerifyAppsOverUsb); @@ -315,25 +314,25 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mVerifyAppsOverUsb.setEnabled(false); } } - mStrictMode = findAndInitCheckboxPref(STRICT_MODE_KEY); - mPointerLocation = findAndInitCheckboxPref(POINTER_LOCATION_KEY); - mShowTouches = findAndInitCheckboxPref(SHOW_TOUCHES_KEY); - mShowScreenUpdates = findAndInitCheckboxPref(SHOW_SCREEN_UPDATES_KEY); - mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY); - mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY); - mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY); - mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY); + mStrictMode = findAndInitSwitchPref(STRICT_MODE_KEY); + mPointerLocation = findAndInitSwitchPref(POINTER_LOCATION_KEY); + mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY); + mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY); + mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY); + mShowCpuUsage = findAndInitSwitchPref(SHOW_CPU_USAGE_KEY); + mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY); + mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY); mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY); mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY); - mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY); - mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY); - mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY); - mForceRtlLayout = findAndInitCheckboxPref(FORCE_RTL_LAYOUT_KEY); + mShowHwScreenUpdates = findAndInitSwitchPref(SHOW_HW_SCREEN_UPDATES_KEY); + mShowHwLayersUpdates = findAndInitSwitchPref(SHOW_HW_LAYERS_UPDATES_KEY); + mDebugLayout = findAndInitSwitchPref(DEBUG_LAYOUT_KEY); + mForceRtlLayout = findAndInitSwitchPref(FORCE_RTL_LAYOUT_KEY); mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY); - mWifiDisplayCertification = findAndInitCheckboxPref(WIFI_DISPLAY_CERTIFICATION_KEY); - mWifiVerboseLogging = findAndInitCheckboxPref(WIFI_VERBOSE_LOGGING_KEY); - mWifiAggressiveHandover = findAndInitCheckboxPref(WIFI_AGGRESSIVE_HANDOVER_KEY); - mWifiAllowScansWithTraffic = findAndInitCheckboxPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY); + mWifiDisplayCertification = findAndInitSwitchPref(WIFI_DISPLAY_CERTIFICATION_KEY); + mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY); + mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY); + mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY); mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY); mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY); @@ -342,20 +341,20 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY); mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY); mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE); - mUseNuplayer = findAndInitCheckboxPref(USE_NUPLAYER_KEY); - mUSBAudio = findAndInitCheckboxPref(USB_AUDIO_KEY); + mUseNuplayer = findAndInitSwitchPref(USE_NUPLAYER_KEY); + mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY); - mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference( + mImmediatelyDestroyActivities = (SwitchPreference) findPreference( IMMEDIATELY_DESTROY_ACTIVITIES_KEY); mAllPrefs.add(mImmediatelyDestroyActivities); - mResetCbPrefs.add(mImmediatelyDestroyActivities); + mResetSwitchPrefs.add(mImmediatelyDestroyActivities); mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY); - mShowAllANRs = (CheckBoxPreference) findPreference( + mShowAllANRs = (SwitchPreference) findPreference( SHOW_ALL_ANRS_KEY); mAllPrefs.add(mShowAllANRs); - mResetCbPrefs.add(mShowAllANRs); + mResetSwitchPrefs.add(mShowAllANRs); Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY); if (hdcpChecking != null) { @@ -381,13 +380,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } } - private CheckBoxPreference findAndInitCheckboxPref(String key) { - CheckBoxPreference pref = (CheckBoxPreference) findPreference(key); + private SwitchPreference findAndInitSwitchPref(String key) { + SwitchPreference pref = (SwitchPreference) findPreference(key); if (pref == null) { throw new IllegalArgumentException("Cannot find preference with key = " + key); } mAllPrefs.add(pref); - mResetCbPrefs.add(pref); + mResetSwitchPrefs.add(pref); return pref; } @@ -482,8 +481,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mSwitchBar.hide(); } - void updateCheckBox(CheckBoxPreference checkBox, boolean value) { - checkBox.setChecked(value); + void updateSwitchPreference(SwitchPreference switchPreference, boolean value) { + switchPreference.setChecked(value); mHaveDebugSettings |= value; } @@ -491,25 +490,25 @@ public class DevelopmentSettings extends SettingsPreferenceFragment final Context context = getActivity(); final ContentResolver cr = context.getContentResolver(); mHaveDebugSettings = false; - updateCheckBox(mEnableAdb, Settings.Global.getInt(cr, + updateSwitchPreference(mEnableAdb, Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) != 0); if (mEnableTerminal != null) { - updateCheckBox(mEnableTerminal, + updateSwitchPreference(mEnableTerminal, context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE) - == PackageManager.COMPONENT_ENABLED_STATE_ENABLED); + == PackageManager.COMPONENT_ENABLED_STATE_ENABLED); } - updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr, + updateSwitchPreference(mBugreportInPower, Settings.Secure.getInt(cr, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0); - updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr, + updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0); - updateCheckBox(mBtHciSnoopLog, Settings.Secure.getInt(cr, + updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr, Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0); if (mEnableOemUnlock != null) { - updateCheckBox(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity())); + updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity())); } - updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr, + updateSwitchPreference(mAllowMockLocation, Settings.Secure.getInt(cr, Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0); - updateCheckBox(mDebugViewAttributes, Settings.Global.getInt(cr, + updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr, Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0); updateHdcpValues(); updatePasswordSummary(); @@ -548,8 +547,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void resetDangerousOptions() { mDontPokeProperties = true; - for (int i=0; i<mResetCbPrefs.size(); i++) { - CheckBoxPreference cb = mResetCbPrefs.get(i); + for (int i=0; i< mResetSwitchPrefs.size(); i++) { + SwitchPreference cb = mResetSwitchPrefs.get(i); if (cb.isChecked()) { cb.setChecked(false); onPreferenceTreeClick(null, cb); @@ -630,7 +629,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateDebuggerOptions() { mDebugApp = Settings.Global.getString( getActivity().getContentResolver(), Settings.Global.DEBUG_APP); - updateCheckBox(mWaitForDebugger, Settings.Global.getInt( + updateSwitchPreference(mWaitForDebugger, Settings.Global.getInt( getActivity().getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0); if (mDebugApp != null && mDebugApp.length() > 0) { String label; @@ -652,7 +651,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateVerifyAppsOverUsbOptions() { - updateCheckBox(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0); mVerifyAppsOverUsb.setEnabled(enableVerifierSetting()); } @@ -732,7 +731,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateStrictModeVisualOptions() { - updateCheckBox(mStrictMode, currentStrictModeActiveIndex() == 1); + updateSwitchPreference(mStrictMode, currentStrictModeActiveIndex() == 1); } private void writePointerLocationOptions() { @@ -741,7 +740,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updatePointerLocationOptions() { - updateCheckBox(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(), Settings.System.POINTER_LOCATION, 0) != 0); } @@ -751,7 +750,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowTouchesOptions() { - updateCheckBox(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(), Settings.System.SHOW_TOUCHES, 0) != 0); } @@ -769,11 +768,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment @SuppressWarnings("unused") int enableGL = reply.readInt(); int showUpdates = reply.readInt(); - updateCheckBox(mShowScreenUpdates, showUpdates != 0); + updateSwitchPreference(mShowScreenUpdates, showUpdates != 0); @SuppressWarnings("unused") int showBackground = reply.readInt(); int disableOverlays = reply.readInt(); - updateCheckBox(mDisableOverlays, disableOverlays != 0); + updateSwitchPreference(mDisableOverlays, disableOverlays != 0); reply.recycle(); data.recycle(); } @@ -816,7 +815,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateHardwareUiOptions() { - updateCheckBox(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false)); + updateSwitchPreference(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false)); } private void writeHardwareUiOptions() { @@ -825,7 +824,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateMsaaOptions() { - updateCheckBox(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false)); + updateSwitchPreference(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false)); } private void writeMsaaOptions() { @@ -885,7 +884,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowHwScreenUpdatesOptions() { - updateCheckBox(mShowHwScreenUpdates, + updateSwitchPreference(mShowHwScreenUpdates, SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false)); } @@ -896,7 +895,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowHwLayersUpdatesOptions() { - updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean( + updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean( HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false)); } @@ -932,7 +931,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateDebugLayoutOptions() { - updateCheckBox(mDebugLayout, + updateSwitchPreference(mDebugLayout, SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false)); } @@ -998,7 +997,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateUseNuplayerOptions() { - updateCheckBox( + updateSwitchPreference( mUseNuplayer, !SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false)); } @@ -1009,7 +1008,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateUSBAudioOptions() { - updateCheckBox(mUSBAudio, Settings.Secure.getInt(getContentResolver(), + updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(), Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0); } @@ -1020,7 +1019,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateForceRtlOptions() { - updateCheckBox(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0); } @@ -1033,7 +1032,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateWifiDisplayCertificationOptions() { - updateCheckBox(mWifiDisplayCertification, Settings.Global.getInt( + updateSwitchPreference(mWifiDisplayCertification, Settings.Global.getInt( getActivity().getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0); } @@ -1046,7 +1045,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWifiVerboseLoggingOptions() { boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0; - updateCheckBox(mWifiVerboseLogging, enabled); + updateSwitchPreference(mWifiVerboseLogging, enabled); } private void writeWifiVerboseLoggingOptions() { @@ -1055,7 +1054,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWifiAggressiveHandoverOptions() { boolean enabled = mWifiManager.getAggressiveHandover() > 0; - updateCheckBox(mWifiAggressiveHandover, enabled); + updateSwitchPreference(mWifiAggressiveHandover, enabled); } private void writeWifiAggressiveHandoverOptions() { @@ -1064,7 +1063,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWifiAllowScansWithTrafficOptions() { boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0; - updateCheckBox(mWifiAllowScansWithTraffic, enabled); + updateSwitchPreference(mWifiAllowScansWithTraffic, enabled); } private void writeWifiAllowScansWithTrafficOptions() { @@ -1121,7 +1120,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateCpuUsageOptions() { - updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.SHOW_PROCESSES, 0) != 0); } @@ -1147,8 +1146,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateImmediatelyDestroyActivitiesOptions() { - updateCheckBox(mImmediatelyDestroyActivities, Settings.Global.getInt( - getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0); + updateSwitchPreference(mImmediatelyDestroyActivities, Settings.Global.getInt( + getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0); } private void updateAnimationScaleValue(int which, ListPreference pref) { @@ -1273,8 +1272,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowAllANRsOptions() { - updateCheckBox(mShowAllANRs, Settings.Secure.getInt( - getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0); + updateSwitchPreference(mShowAllANRs, Settings.Secure.getInt( + getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0); } @Override diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index bbd98fb0c..6a0a24917 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -212,7 +212,7 @@ public class MasterClear extends Fragment { try { if (desc.iconId != 0) { Context authContext = context.createPackageContext(desc.packageName, 0); - icon = authContext.getResources().getDrawable(desc.iconId); + icon = authContext.getDrawable(desc.iconId); } } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "No icon for account type " + desc.type); diff --git a/src/com/android/settings/NsdEnabler.java b/src/com/android/settings/NsdEnabler.java index acdf92ea7..f638bc382 100644 --- a/src/com/android/settings/NsdEnabler.java +++ b/src/com/android/settings/NsdEnabler.java @@ -21,18 +21,16 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.nsd.NsdManager; -import android.preference.CheckBoxPreference; import android.preference.Preference; -import android.preference.PreferenceScreen; -import com.android.settings.R; +import android.preference.SwitchPreference; /** * NsdEnabler is a helper to manage network service discovery on/off checkbox state. */ public class NsdEnabler implements Preference.OnPreferenceChangeListener { private final Context mContext; - private final CheckBoxPreference mCheckbox; + private final SwitchPreference mSwitchPreference; private final IntentFilter mIntentFilter; private NsdManager mNsdManager; @@ -47,27 +45,27 @@ public class NsdEnabler implements Preference.OnPreferenceChangeListener { } }; - public NsdEnabler(Context context, CheckBoxPreference checkBoxPreference) { + public NsdEnabler(Context context, SwitchPreference pref) { mContext = context; - mCheckbox = checkBoxPreference; + mSwitchPreference = pref; mNsdManager = (NsdManager) mContext.getSystemService(Context.NSD_SERVICE); mIntentFilter = new IntentFilter(NsdManager.ACTION_NSD_STATE_CHANGED); } public void resume() { mContext.registerReceiver(mReceiver, mIntentFilter); - mCheckbox.setOnPreferenceChangeListener(this); + mSwitchPreference.setOnPreferenceChangeListener(this); } public void pause() { mContext.unregisterReceiver(mReceiver); - mCheckbox.setOnPreferenceChangeListener(null); + mSwitchPreference.setOnPreferenceChangeListener(null); } public boolean onPreferenceChange(Preference preference, Object value) { final boolean desiredState = (Boolean) value; - mCheckbox.setEnabled(false); + mSwitchPreference.setEnabled(false); mNsdManager.setEnabled(desiredState); return false; } @@ -75,12 +73,12 @@ public class NsdEnabler implements Preference.OnPreferenceChangeListener { private void handleNsdStateChanged(int newState) { switch (newState) { case NsdManager.NSD_STATE_DISABLED: - mCheckbox.setChecked(false); - mCheckbox.setEnabled(true); + mSwitchPreference.setChecked(false); + mSwitchPreference.setEnabled(true); break; case NsdManager.NSD_STATE_ENABLED: - mCheckbox.setChecked(true); - mCheckbox.setEnabled(true); + mSwitchPreference.setChecked(true); + mSwitchPreference.setEnabled(true); break; } } diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index 171059c29..c674f13f1 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -63,7 +63,7 @@ public class RegulatoryInfoDisplayActivity extends Activity implements int resId = getResourceId(); if (resId != 0) { try { - Drawable d = resources.getDrawable(resId); + Drawable d = getDrawable(resId); // set to false if the width or height is <= 2 // (missing PNG can return an empty 2x2 pixel Drawable) regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2 diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java index 7d7599ffa..64e1e3f51 100644 --- a/src/com/android/settings/RestrictedSettingsFragment.java +++ b/src/com/android/settings/RestrictedSettingsFragment.java @@ -16,8 +16,6 @@ package com.android.settings; -import java.util.HashSet; - import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; @@ -27,8 +25,6 @@ import android.content.RestrictionsManager; import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserManager; -import android.preference.CheckBoxPreference; -import android.preference.Preference; /** * Base class for settings screens that should be pin protected when in restricted mode. diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 14c4936e9..427e9d319 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -43,12 +43,12 @@ import android.widget.ArrayAdapter; import android.widget.BaseAdapter; import android.widget.BaseExpandableListAdapter; import android.widget.Button; -import android.widget.CheckBox; import android.widget.ExpandableListView; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.ProgressBar; import android.widget.Spinner; +import android.widget.Switch; import android.widget.TabHost; import android.widget.TextView; @@ -90,17 +90,17 @@ public class TrustedCredentialsSettings extends Fragment { private final int mProgress; private final int mList; private final int mExpandableList; - private final boolean mCheckbox; + private final boolean mSwitch; private Tab(String tag, int label, int view, int progress, int list, int expandableList, - boolean checkbox) { + boolean withSwitch) { mTag = tag; mLabel = label; mView = view; mProgress = progress; mList = list; mExpandableList = expandableList; - mCheckbox = checkbox; + mSwitch = withSwitch; } private List<ParcelableString> getAliases(IKeyChainService service) throws RemoteException { @@ -148,7 +148,7 @@ public class TrustedCredentialsSettings extends Fragment { } private void postOperationUpdate(boolean ok, CertHolder certHolder) { if (ok) { - if (certHolder.mTab.mCheckbox) { + if (certHolder.mTab.mSwitch) { certHolder.mDeleted = !certHolder.mDeleted; } else { certHolder.mAdapter.remove(certHolder); @@ -586,7 +586,7 @@ public class TrustedCredentialsSettings extends Fragment { convertView.findViewById(R.id.trusted_credential_subject_primary); holder.mSubjectSecondaryView = (TextView) convertView.findViewById(R.id.trusted_credential_subject_secondary); - holder.mCheckBox = (CheckBox) convertView.findViewById( + holder.mSwitch = (Switch) convertView.findViewById( R.id.trusted_credential_status); convertView.setTag(holder); } else { @@ -594,9 +594,9 @@ public class TrustedCredentialsSettings extends Fragment { } holder.mSubjectPrimaryView.setText(certHolder.mSubjectPrimary); holder.mSubjectSecondaryView.setText(certHolder.mSubjectSecondary); - if (mTab.mCheckbox) { - holder.mCheckBox.setChecked(!certHolder.mDeleted); - holder.mCheckBox.setVisibility(View.VISIBLE); + if (mTab.mSwitch) { + holder.mSwitch.setChecked(!certHolder.mDeleted); + holder.mSwitch.setVisibility(View.VISIBLE); } return convertView; } @@ -604,7 +604,7 @@ public class TrustedCredentialsSettings extends Fragment { private static class ViewHolder { private TextView mSubjectPrimaryView; private TextView mSubjectSecondaryView; - private CheckBox mCheckBox; + private Switch mSwitch; } private void showCertDialog(final CertHolder certHolder) { diff --git a/src/com/android/settings/UserSpinnerAdapter.java b/src/com/android/settings/UserSpinnerAdapter.java index 001dfc460..eb4a118f9 100644 --- a/src/com/android/settings/UserSpinnerAdapter.java +++ b/src/com/android/settings/UserSpinnerAdapter.java @@ -51,7 +51,7 @@ public class UserSpinnerAdapter implements SpinnerAdapter { UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier()); if (userInfo.isManagedProfile()) { name = context.getString(R.string.managed_user_title); - icon = Resources.getSystem().getDrawable( + icon = context.getDrawable( com.android.internal.R.drawable.ic_corp_icon); } else { name = userInfo.name; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 5c7a456f6..88536c481 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -211,7 +211,8 @@ public final class Utils { Bundle metaData = resolveInfo.activityInfo.metaData; if (res != null && metaData != null) { - icon = res.getDrawable(metaData.getInt(META_DATA_PREFERENCE_ICON)); + icon = res.getDrawable( + metaData.getInt(META_DATA_PREFERENCE_ICON), null); title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE)); summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY)); } @@ -335,8 +336,7 @@ public final class Utils { /** Formats a double from 0.0..1.0 as a percentage. */ private static String formatPercentage(double percentage) { - BidiFormatter bf = BidiFormatter.getInstance(); - return bf.unicodeWrap(NumberFormat.getPercentInstance().format(percentage)); + return NumberFormat.getPercentInstance().format(percentage); } public static boolean isBatteryPresent(Intent batteryChangedIntent) { diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 9cb3d72f8..d14241287 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -35,7 +35,6 @@ import android.os.Bundle; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; -import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceScreen; @@ -262,7 +261,7 @@ public class WirelessSettings extends SettingsPreferenceFragment mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE); SwitchPreference nfc = (SwitchPreference) findPreference(KEY_TOGGLE_NFC); PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS); - CheckBoxPreference nsd = (CheckBoxPreference) findPreference(KEY_TOGGLE_NSD); + SwitchPreference nsd = (SwitchPreference) findPreference(KEY_TOGGLE_NSD); mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference); mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam); diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 92c478e02..7d5171205 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -30,7 +30,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; import android.os.UserHandle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceCategory; @@ -184,11 +183,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private PreferenceCategory mServicesCategory; private PreferenceCategory mSystemsCategory; - private CheckBoxPreference mToggleLargeTextPreference; - private CheckBoxPreference mToggleHighTextContrastPreference; - private CheckBoxPreference mTogglePowerButtonEndsCallPreference; - private CheckBoxPreference mToggleLockScreenRotationPreference; - private CheckBoxPreference mToggleSpeakPasswordPreference; + private SwitchPreference mToggleLargeTextPreference; + private SwitchPreference mToggleHighTextContrastPreference; + private SwitchPreference mTogglePowerButtonEndsCallPreference; + private SwitchPreference mToggleLockScreenRotationPreference; + private SwitchPreference mToggleSpeakPasswordPreference; private ListPreference mSelectLongPressTimeoutPreference; private Preference mNoServicesMessagePreference; private PreferenceScreen mCaptioningPreferenceScreen; @@ -350,11 +349,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Large text. mToggleLargeTextPreference = - (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE); // Text contrast. mToggleHighTextContrastPreference = - (CheckBoxPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE); // Display inversion. mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE); @@ -362,7 +361,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Power button ends calls. mTogglePowerButtonEndsCallPreference = - (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE); if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER) || !Utils.isVoiceCapable(getActivity())) { mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference); @@ -370,14 +369,14 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Lock screen rotation. mToggleLockScreenRotationPreference = - (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE); if (!RotationPolicy.isRotationSupported(getActivity())) { mSystemsCategory.removePreference(mToggleLockScreenRotationPreference); } // Speak passwords. mToggleSpeakPasswordPreference = - (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE); // Long press timeout. mSelectLongPressTimeoutPreference = diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 08fba6719..0b7600b58 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -63,10 +63,7 @@ public class ToggleAccessibilityServicePreferenceFragment new SettingsContentObserver(new Handler()) { @Override public void onChange(boolean selfChange, Uri uri) { - String settingValue = Settings.Secure.getString(getContentResolver(), - Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES); - final boolean enabled = settingValue.contains(mComponentName.flattenToString()); - mSwitchBar.setCheckedInternal(enabled); + updateSwitchBarToggleSwitch(); } }; @@ -83,6 +80,7 @@ public class ToggleAccessibilityServicePreferenceFragment @Override public void onResume() { mSettingsContentObserver.register(getContentResolver()); + updateSwitchBarToggleSwitch(); super.onResume(); } @@ -208,6 +206,14 @@ public class ToggleAccessibilityServicePreferenceFragment } } + private void updateSwitchBarToggleSwitch() { + final String settingValue = Settings.Secure.getString(getContentResolver(), + Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES); + final boolean checked = settingValue != null + && settingValue.contains(mComponentName.flattenToString()); + mSwitchBar.setCheckedInternal(checked); + } + private View createEnableDialogContentView(AccessibilityServiceInfo info) { LayoutInflater inflater = (LayoutInflater) getSystemService( Context.LAYOUT_INFLATER_SERVICE); @@ -239,7 +245,7 @@ public class ToggleAccessibilityServicePreferenceFragment ImageView imageView = (ImageView) capabilityView.findViewById( com.android.internal.R.id.perm_icon); - imageView.setImageDrawable(getResources().getDrawable( + imageView.setImageDrawable(getActivity().getDrawable( com.android.internal.R.drawable.ic_text_dot)); TextView labelView = (TextView) capabilityView.findViewById( @@ -265,7 +271,7 @@ public class ToggleAccessibilityServicePreferenceFragment imageView = (ImageView) capabilityView.findViewById( com.android.internal.R.id.perm_icon); - imageView.setImageDrawable(getResources().getDrawable( + imageView.setImageDrawable(getActivity().getDrawable( com.android.internal.R.drawable.ic_text_dot)); labelView = (TextView) capabilityView.findViewById( diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index f0896c963..d51610d5b 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -74,8 +74,8 @@ public class AccountSyncSettings extends AccountPreferenceBase { private ImageView mProviderIcon; private TextView mErrorInfoView; private Account mAccount; - private ArrayList<SyncStateCheckBoxPreference> mCheckBoxes = - new ArrayList<SyncStateCheckBoxPreference>(); + private ArrayList<SyncStateSwitchPreference> mSwitches = + new ArrayList<SyncStateSwitchPreference>(); private ArrayList<SyncAdapterType> mInvisibleAdapters = Lists.newArrayList(); @Override @@ -209,9 +209,9 @@ public class AccountSyncSettings extends AccountPreferenceBase { mAuthenticatorHelper.stopListeningToAccountUpdates(); } - private void addSyncStateCheckBox(Account account, String authority) { - SyncStateCheckBoxPreference item = - new SyncStateCheckBoxPreference(getActivity(), account, authority); + private void addSyncStateSwitch(Account account, String authority) { + SyncStateSwitchPreference item = + new SyncStateSwitchPreference(getActivity(), account, authority); item.setPersistent(false); final ProviderInfo providerInfo = getPackageManager().resolveContentProviderAsUser( authority, 0, mUserHandle.getIdentifier()); @@ -226,7 +226,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { String title = getString(R.string.sync_item_title, providerLabel); item.setTitle(title); item.setKey(authority); - mCheckBoxes.add(item); + mSwitches.add(item); } @Override @@ -282,8 +282,8 @@ public class AccountSyncSettings extends AccountPreferenceBase { @Override public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) { - if (preference instanceof SyncStateCheckBoxPreference) { - SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) preference; + if (preference instanceof SyncStateSwitchPreference) { + SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) preference; String authority = syncPref.getAuthority(); Account account = syncPref.getAccount(); final int userId = mUserHandle.getIdentifier(); @@ -326,10 +326,10 @@ public class AccountSyncSettings extends AccountPreferenceBase { int count = getPreferenceScreen().getPreferenceCount(); for (int i = 0; i < count; i++) { Preference pref = getPreferenceScreen().getPreference(i); - if (! (pref instanceof SyncStateCheckBoxPreference)) { + if (! (pref instanceof SyncStateSwitchPreference)) { continue; } - SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) pref; + SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) pref; if (!syncPref.isChecked()) { continue; } @@ -376,15 +376,15 @@ public class AccountSyncSettings extends AccountPreferenceBase { List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncsAsUser(userId); boolean syncIsFailing = false; - // Refresh the sync status checkboxes - some syncs may have become active. - updateAccountCheckboxes(); + // Refresh the sync status switches - some syncs may have become active. + updateAccountSwitches(); for (int i = 0, count = getPreferenceScreen().getPreferenceCount(); i < count; i++) { Preference pref = getPreferenceScreen().getPreference(i); - if (! (pref instanceof SyncStateCheckBoxPreference)) { + if (! (pref instanceof SyncStateSwitchPreference)) { continue; } - SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) pref; + SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) pref; String authority = syncPref.getAuthority(); Account account = syncPref.getAccount(); @@ -450,7 +450,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { finish(); return; } - updateAccountCheckboxes(); + updateAccountSwitches(); onSyncStateUpdated(); } @@ -468,7 +468,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { return false; } - private void updateAccountCheckboxes() { + private void updateAccountSwitches() { mInvisibleAdapters.clear(); SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser( @@ -480,7 +480,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { if (!sa.accountType.equals(mAccount.type)) continue; if (sa.isUserVisible()) { if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.d(TAG, "updateAccountCheckboxes: added authority " + sa.authority + Log.d(TAG, "updateAccountSwitches: added authority " + sa.authority + " to accountType " + sa.accountType); } authorities.add(sa.authority); @@ -491,10 +491,10 @@ public class AccountSyncSettings extends AccountPreferenceBase { } } - for (int i = 0, n = mCheckBoxes.size(); i < n; i++) { - getPreferenceScreen().removePreference(mCheckBoxes.get(i)); + for (int i = 0, n = mSwitches.size(); i < n; i++) { + getPreferenceScreen().removePreference(mSwitches.get(i)); } - mCheckBoxes.clear(); + mSwitches.clear(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.d(TAG, "looking for sync adapters that match account " + mAccount); @@ -508,13 +508,13 @@ public class AccountSyncSettings extends AccountPreferenceBase { Log.d(TAG, " found authority " + authority + " " + syncState); } if (syncState > 0) { - addSyncStateCheckBox(mAccount, authority); + addSyncStateSwitch(mAccount, authority); } } - Collections.sort(mCheckBoxes); - for (int i = 0, n = mCheckBoxes.size(); i < n; i++) { - getPreferenceScreen().addPreference(mCheckBoxes.get(i)); + Collections.sort(mSwitches); + for (int i = 0, n = mSwitches.size(); i < n; i++) { + getPreferenceScreen().addPreference(mSwitches.get(i)); } } diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java index cc8a6d58c..3757d97c6 100644 --- a/src/com/android/settings/accounts/AuthenticatorHelper.java +++ b/src/com/android/settings/accounts/AuthenticatorHelper.java @@ -111,7 +111,7 @@ final public class AuthenticatorHelper extends BroadcastReceiver { Context authContext = context.createPackageContextAsUser(desc.packageName, 0, mUserHandle); icon = mContext.getPackageManager().getUserBadgedIcon( - authContext.getResources().getDrawable(desc.iconId), mUserHandle); + authContext.getDrawable(desc.iconId), mUserHandle); synchronized (mAccTypeIconCache) { mAccTypeIconCache.put(accountType, icon); } diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index e52d640be..5e7e81e16 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -216,7 +216,7 @@ public class ChooseAccountActivity extends PreferenceActivity { AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType); Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle); icon = getPackageManager().getUserBadgedIcon( - authContext.getResources().getDrawable(desc.iconId), mUserHandle); + authContext.getDrawable(desc.iconId), mUserHandle); } catch (PackageManager.NameNotFoundException e) { // TODO: place holder icon for missing account icons? Log.w(TAG, "No icon name for account type " + accountType); diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index db746eeda..4d6387096 100644 --- a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -19,7 +19,7 @@ package com.android.settings.accounts; import android.accounts.Account; import android.app.ActivityManager; import android.content.Context; -import android.preference.CheckBoxPreference; +import android.preference.SwitchPreference; import android.util.AttributeSet; import android.util.Log; import android.view.View; @@ -28,7 +28,7 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.widget.AnimatedImageView; -public class SyncStateCheckBoxPreference extends CheckBoxPreference { +public class SyncStateSwitchPreference extends SwitchPreference { private boolean mIsActive = false; private boolean mIsPending = false; @@ -42,14 +42,14 @@ public class SyncStateCheckBoxPreference extends CheckBoxPreference { */ private boolean mOneTimeSyncMode = false; - public SyncStateCheckBoxPreference(Context context, AttributeSet attrs) { + public SyncStateSwitchPreference(Context context, AttributeSet attrs) { super(context, attrs); setWidgetLayoutResource(R.layout.preference_widget_sync_toggle); mAccount = null; mAuthority = null; } - public SyncStateCheckBoxPreference(Context context, Account account, String authority) { + public SyncStateSwitchPreference(Context context, Account account, String authority) { super(context, null); mAccount = account; mAuthority = authority; @@ -70,9 +70,9 @@ public class SyncStateCheckBoxPreference extends CheckBoxPreference { final boolean failedVisible = mFailed && !activeVisible; syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE); - View checkBox = view.findViewById(android.R.id.checkbox); + View switchView = view.findViewById(com.android.internal.R.id.switchWidget); if (mOneTimeSyncMode) { - checkBox.setVisibility(View.GONE); + switchView.setVisibility(View.GONE); /* * Override the summary. Fill in the %1$s with the existing summary @@ -82,7 +82,7 @@ public class SyncStateCheckBoxPreference extends CheckBoxPreference { TextView summary = (TextView) view.findViewById(android.R.id.summary); summary.setText(getContext().getString(R.string.sync_one_time_sync, getSummary())); } else { - checkBox.setVisibility(View.VISIBLE); + switchView.setVisibility(View.VISIBLE); } } @@ -131,7 +131,7 @@ public class SyncStateCheckBoxPreference extends CheckBoxPreference { @Override protected void onClick() { // When we're in one-time sync mode, we don't want a click to change the - // checkbox state + // Switch state if (!mOneTimeSyncMode) { if (ActivityManager.isUserAMonkey()) { Log.d("SyncState", "ignoring monkey's attempt to flip sync state"); diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java index 580c44e66..1ab3c7344 100644 --- a/src/com/android/settings/applications/AppOpsState.java +++ b/src/com/android/settings/applications/AppOpsState.java @@ -269,7 +269,7 @@ public class AppOpsState { return mIcon; } - return mState.mContext.getResources().getDrawable( + return mState.mContext.getDrawable( android.R.drawable.sym_def_app_icon); } diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java index 1c2eb2c70..9c5118150 100644 --- a/src/com/android/settings/applications/ApplicationsState.java +++ b/src/com/android/settings/applications/ApplicationsState.java @@ -144,7 +144,7 @@ public class ApplicationsState { return true; } else { this.mounted = false; - this.icon = context.getResources().getDrawable( + this.icon = context.getDrawable( com.android.internal.R.drawable.sym_app_on_sd_unavailable_icon); } } else if (!this.mounted) { diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java index 1019abca2..1d24148c9 100644 --- a/src/com/android/settings/applications/RunningState.java +++ b/src/com/android/settings/applications/RunningState.java @@ -679,7 +679,7 @@ public class RunningState { return constState.newDrawable(); } } - return context.getResources().getDrawable( + return context.getDrawable( com.android.internal.R.drawable.ic_menu_cc); } } diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index 757535a7c..0109e35ee 100755 --- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java +++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java @@ -194,7 +194,7 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment int iconResource = profile.getDrawableResource(mCachedDevice.getBtClass()); if (iconResource != 0) { - pref.setIcon(getResources().getDrawable(iconResource)); + pref.setIcon(getActivity().getDrawable(iconResource)); } refreshProfilePreference(pref, profile); diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java index 4ff4dfd14..0dfd5c9d8 100644 --- a/src/com/android/settings/fuelgauge/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/BatteryEntry.java @@ -189,7 +189,7 @@ public class BatteryEntry { break; } if (iconId > 0) { - icon = context.getResources().getDrawable(iconId); + icon = context.getDrawable(iconId); } if ((name == null || iconId == 0) && this.sipper.uidObj != null) { getQuickNameIconForUid(this.sipper.uidObj); @@ -228,7 +228,7 @@ public class BatteryEntry { name = context.getResources().getString(R.string.process_mediaserver_label); } iconId = R.drawable.ic_power_system; - icon = context.getResources().getDrawable(iconId); + icon = context.getDrawable(iconId); return; } else { //name = packages[0]; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java index 765f101fc..78e3c6d07 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java @@ -494,6 +494,7 @@ public class BatteryHistoryChart extends View { mMinPercentLabelString = Utils.formatPercentage(0); mBatteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast); + String batteryPercentString = Utils.formatPercentage(mBatteryLevel); long remainingTimeUs = 0; mDischarging = true; if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) { @@ -503,9 +504,9 @@ public class BatteryHistoryChart extends View { String timeString = Formatter.formatShortElapsedTime(getContext(), drainTime / 1000); mChargeLabelString = getContext().getResources().getString( - R.string.power_discharging_duration, mBatteryLevel, timeString); + R.string.power_discharging_duration, batteryPercentString, timeString); } else { - mChargeLabelString = Utils.formatPercentage(mBatteryLevel); + mChargeLabelString = batteryPercentString; } } else { final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs); @@ -530,10 +531,10 @@ public class BatteryHistoryChart extends View { resId = R.string.power_charging_duration; } mChargeLabelString = getContext().getResources().getString( - resId, mBatteryLevel, timeString); + resId, batteryPercentString, timeString); } else { mChargeLabelString = getContext().getResources().getString( - R.string.power_charging, mBatteryLevel, statusLabel); + R.string.power_charging, batteryPercentString, statusLabel); } } mDrainString = ""; diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java index bd989d04f..94620ccb1 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -37,6 +37,7 @@ import android.widget.Switch; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.Utils; import com.android.settings.notification.SettingPref; import com.android.settings.widget.SwitchBar; @@ -78,7 +79,8 @@ public class BatterySaverSettings extends SettingsPreferenceFragment @Override protected String getCaption(Resources res, int value) { if (value > 0 && value < 100) { - return res.getString(R.string.battery_saver_turn_on_automatically_pct, value); + return res.getString(R.string.battery_saver_turn_on_automatically_pct, + Utils.formatPercentage(value)); } return res.getString(R.string.battery_saver_turn_on_automatically_never); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 9dca02904..e3c8dabfd 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -379,7 +379,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener // Use default icon } } else if (iconId != 0) { - mAppIcon = getActivity().getResources().getDrawable(iconId); + mAppIcon = getActivity().getDrawable(iconId); } if (mAppIcon == null) { mAppIcon = getActivity().getPackageManager().getDefaultActivityIcon(); diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index bae9dbc44..c529f34b0 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -24,28 +24,23 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.res.Configuration; -import android.content.res.Resources; import android.database.ContentObserver; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; import android.os.Bundle; import android.os.Handler; -import android.os.UserHandle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceCategory; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.Settings; import android.provider.Settings.System; -import android.speech.RecognitionService; import android.speech.tts.TtsEngines; import android.text.TextUtils; import android.view.InputDevice; @@ -326,11 +321,11 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment getSystemService(Context.INPUT_METHOD_SERVICE); imm.showInputMethodPicker(); } - } else if (preference instanceof CheckBoxPreference) { - final CheckBoxPreference chkPref = (CheckBoxPreference) preference; - if (chkPref == mGameControllerCategory.findPreference("vibrate_input_devices")) { + } else if (preference instanceof SwitchPreference) { + final SwitchPreference pref = (SwitchPreference) preference; + if (pref == mGameControllerCategory.findPreference("vibrate_input_devices")) { System.putInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES, - chkPref.isChecked() ? 1 : 0); + pref.isChecked() ? 1 : 0); return true; } } @@ -601,9 +596,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment if (haveInputDeviceWithVibrator()) { getPreferenceScreen().addPreference(mGameControllerCategory); - CheckBoxPreference chkPref = (CheckBoxPreference) + SwitchPreference pref = (SwitchPreference) mGameControllerCategory.findPreference("vibrate_input_devices"); - chkPref.setChecked(System.getInt(getContentResolver(), + pref.setChecked(System.getInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0); } else { getPreferenceScreen().removePreference(mGameControllerCategory); diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java index 4b54137cf..b6160fdd6 100644 --- a/src/com/android/settings/net/UidDetailProvider.java +++ b/src/com/android/settings/net/UidDetailProvider.java @@ -138,7 +138,7 @@ public class UidDetailProvider { if (info != null) { if (info.isManagedProfile()) { detail.label = res.getString(R.string.managed_user_title); - detail.icon = Resources.getSystem().getDrawable( + detail.icon = mContext.getDrawable( com.android.internal.R.drawable.ic_corp_icon); } else { detail.label = res.getString(R.string.running_process_item_user_label, diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index df4e396d3..02254dd1e 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -22,11 +22,11 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.Settings; import android.text.TextUtils; import android.util.Log; @@ -95,7 +95,7 @@ public class PaymentSettings extends SettingsPreferenceFragment implements emptyImage.setVisibility(View.VISIBLE); getListView().setVisibility(View.GONE); } else { - CheckBoxPreference foreground = new CheckBoxPreference(getActivity()); + SwitchPreference foreground = new SwitchPreference(getActivity()); boolean foregroundMode = mPaymentBackend.isForegroundMode(); foreground.setPersistent(false); foreground.setTitle(getString(R.string.nfc_payment_favor_foreground)); @@ -231,7 +231,7 @@ public class PaymentSettings extends SettingsPreferenceFragment implements @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - if (preference instanceof CheckBoxPreference) { + if (preference instanceof SwitchPreference) { mPaymentBackend.setForegroundMode(((Boolean) newValue).booleanValue()); return true; } else { diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index c61f91ece..3f4d3df8a 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -275,7 +275,7 @@ public class NotificationStation extends SettingsPreferenceFragment { } try { - return r.getDrawable(resId); + return r.getDrawable(resId, null); } catch (RuntimeException e) { Log.w(TAG, "Icon not found in " + (pkg != null ? resId : "<system>") diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java index f94e6a132..f391f86b3 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreference.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java @@ -105,6 +105,7 @@ public class VolumeSeekBarPreference extends SeekBarPreference } }; } + mVolumizer.start(); mVolumizer.setSeekBar(mSeekBar); mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon); mCallback.onStreamValueChanged(mStream, mSeekBar.getProgress()); diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java index 2c7600297..6abbc3d45 100644 --- a/src/com/android/settings/search/Ranking.java +++ b/src/com/android/settings/search/Ranking.java @@ -31,6 +31,7 @@ import com.android.settings.WirelessSettings; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.deviceinfo.Memory; +import com.android.settings.deviceinfo.UsbSettings; import com.android.settings.fuelgauge.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; @@ -63,7 +64,7 @@ public final class Ranking { public static final int RANK_DISPLAY = 7; public static final int RANK_WALLPAPER = 8; public static final int RANK_NOTIFICATIONS = 9; - public static final int RANK_MEMORY = 10; + public static final int RANK_STORAGE = 10; public static final int RANK_POWER_USAGE = 11; public static final int RANK_USERS = 12; public static final int RANK_LOCATION = 13; @@ -118,8 +119,9 @@ public final class Ranking { sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS); sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS); - // Memory - sRankMap.put(Memory.class.getName(), RANK_MEMORY); + // Storage + sRankMap.put(Memory.class.getName(), RANK_STORAGE); + sRankMap.put(UsbSettings.class.getName(), RANK_STORAGE); // Battery sRankMap.put(PowerUsageSummary.class.getName(), RANK_POWER_USAGE); diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 105ce7ef1..3051fd206 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -33,6 +33,7 @@ import com.android.settings.WirelessSettings; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.deviceinfo.Memory; +import com.android.settings.deviceinfo.UsbSettings; import com.android.settings.fuelgauge.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; @@ -165,6 +166,13 @@ public final class SearchIndexableResources { Memory.class.getName(), R.drawable.ic_settings_storage)); + sResMap.put(UsbSettings.class.getName(), + new SearchIndexableResource( + Ranking.getRankForClassName(UsbSettings.class.getName()), + R.xml.usb_settings, + UsbSettings.class.getName(), + R.drawable.ic_settings_storage)); + sResMap.put(PowerUsageSummary.class.getName(), new SearchIndexableResource( Ranking.getRankForClassName(PowerUsageSummary.class.getName()), diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java index 2449353c1..542de4100 100644 --- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java +++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 9eee4accc..6fa5a7955 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -31,9 +31,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.graphics.Bitmap; -import android.graphics.ColorFilter; -import android.graphics.ColorMatrix; -import android.graphics.ColorMatrixColorFilter; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; @@ -41,7 +38,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.MultiSelectListPreference; import android.preference.Preference; @@ -929,10 +925,10 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen Preference p = null; switch (entry.getType()) { case RestrictionEntry.TYPE_BOOLEAN: - p = new CheckBoxPreference(context); + p = new SwitchPreference(context); p.setTitle(entry.getTitle()); p.setSummary(entry.getDescription()); - ((CheckBoxPreference)p).setChecked(entry.getSelectedState()); + ((SwitchPreference)p).setChecked(entry.getSelectedState()); break; case RestrictionEntry.TYPE_CHOICE: case RestrictionEntry.TYPE_CHOICE_LEVEL: diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index c3f22a79a..fdaa042c6 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -39,12 +39,12 @@ import android.net.wifi.WpsInfo; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceCategory; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.Settings; import android.util.Slog; import android.util.TypedValue; @@ -360,7 +360,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { } // switch for Listen Mode - CheckBoxPreference cbp = new CheckBoxPreference(getActivity()) { + SwitchPreference pref = new SwitchPreference(getActivity()) { @Override protected void onClick() { mListen = !mListen; @@ -368,12 +368,12 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { setChecked(mListen); } }; - cbp.setTitle(R.string.wifi_display_listen_mode); - cbp.setChecked(mListen); - mCertCategory.addPreference(cbp); + pref.setTitle(R.string.wifi_display_listen_mode); + pref.setChecked(mListen); + mCertCategory.addPreference(pref); // switch for Autonomous GO - cbp = new CheckBoxPreference(getActivity()) { + pref = new SwitchPreference(getActivity()) { @Override protected void onClick() { mAutoGO = !mAutoGO; @@ -385,9 +385,9 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { setChecked(mAutoGO); } }; - cbp.setTitle(R.string.wifi_display_autonomous_go); - cbp.setChecked(mAutoGO); - mCertCategory.addPreference(cbp); + pref.setTitle(R.string.wifi_display_autonomous_go); + pref.setChecked(mAutoGO); + mCertCategory.addPreference(pref); // Drop down list for choosing WPS method (PBC/KEYPAD/DISPLAY) ListPreference lp = new ListPreference(getActivity()) { diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index bda13ffcd..29056d731 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -29,7 +29,6 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WpsInfo; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java index fc34f3b82..88bb9fa51 100644 --- a/src/com/android/settings/wifi/WifiApEnabler.java +++ b/src/com/android/settings/wifi/WifiApEnabler.java @@ -194,6 +194,7 @@ public class WifiApEnabler { break; case WifiManager.WIFI_AP_STATE_DISABLING: mSwitch.setSummary(R.string.wifi_tether_stopping); + mSwitch.setChecked(false); mSwitch.setEnabled(false); break; case WifiManager.WIFI_AP_STATE_DISABLED: |