Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken
* commit '567ca0805e884c124e537edc7eac5cecf8d4e202':
Fix regression in removing settings that aren't relevant for a platform.
Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp
* commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
Fix regression in removing settings that aren't relevant for a platform.
Bug: 2630695
The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.
Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.
Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken
* commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1':
Labeled categories to help clarify Sound prefs.
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp
* commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6':
Labeled categories to help clarify Sound prefs.
Under the hood there remain three axes:
1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT}
2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1
3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER)
- always | == VIBRATE_SETTING_ON
- never | == VIBRATE_SETTING_OFF
- only in silent | == VIBRATE_SETTING_ONLY_SILENT
We now expose this to the user much more simply by
collapsing (2) and (3) above, and discarding states that
don't make sense:
- VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT
- VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT
Now we offer the user four choices:
Phone vibrate:
* "Never"
--> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF
* "Always"
--> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON
* "Only in silent mode"
--> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT
* "Only when not in silent mode"
--> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON
This should make it easier to choose exactly the behavior
the user wants as well as avoid nonsensical combinations of
settings.
Bug: 2598014
Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken
* commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40':
Display current IP address in advanced Wifi settings screen
Merge commit '91523d601a6569ce9295a5617ca92a24582ff502' into kraken
* commit '91523d601a6569ce9295a5617ca92a24582ff502':
Fix 2579923: Update language to make consistent with related feature.
This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.
Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.
In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.
Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.
Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
Making sure that the language, country, and variant defaults are always
set to something to ensure that there won't be an NPE.
Dismissing the ListPreference dialogs before a rotation to avoid list
data corruption caused by the list being displayed while its data is
being re-initialized.
Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
Merge commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2' into kraken
* commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2':
Add new string to identify what speech recognizer the settings are for.
Volume (of the ringer, notifications, media, and alarms) may
no longer be adjusted while the phone is in silent mode.
This was the behavior in Eclair and earlier releases.
This rolls back a small portion of change I724c43aa in the
interest of stability (see bugs listed below for weirdness
that occurs when the ringer's SeekBarVolumizer is visible
when the ringtone stream is muted).
Bug: 2552268
Bug: 2544706
Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
This is part 3 of the fix for bug 2364220 "Accessibility improvements for
ending calls".
This change adds a checkbox under "Accessibility settings" to control the
new Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR value, which allows the
user to specify that the Power button should hang up while in-call
(instead of just turning off the screen.) The checkbox is only shown on
devices that actually have a POWER button.
Yeah, it's a little strange having this under Accessibility (since it's not
that obvious *why* this feature is accessibility-related), but there's no
obvious better place. See discussion in the bug for more info.
Bug: 2364220
Change-Id: I0fd7cf357972519b390575b9c06a4bbe46ff1c9b
