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.
There will be a new setting to enable to disable bluetooth
voicedialing while the lock screen is up. The strings need
to go in ASAP so that the translation people can see then,
although they are not yet referenced in the code.
The sounds are present in the build but are turned off by
default (and there isn't currently a UI to turn them on).
(Mentioned in http://b/2469862)
Change-Id: I9ded1d67cc19204113047aeb8fc8b0123cea1427
The updated settings tree looks like this:
[ ] Silent mode (unchanged)
[ ] Allow vibration in silent mode (new)
Phone vibrate: (changed from boolean)
( ) Always
( ) Only in silent mode
( ) Never
See change I14cf91b0 for explanation & framework support.
Change-Id: I22ba7bcfa5ddf4e545800083c6e80fb655f211e5
Settings for Manage Applications that allow the user to choose default application installaction location.
Options are: internal flash, SD card, or automatic.
Bug: 2391822
In Settings -> About phone, the platform version was under the label
"Firmware version". That doesn't really mean anything, because
the build number is a more accurate identifier for the build that
is currently running.
actually getting linked to the recognizer's settings in that case.
Also add a summary line to the line for choosing the recognizer, so you
can see which one is currently selected, in the case that more than one
is installed.
Fix the TTS settings strings to match what we do for voice input.
only showing the option to choose if there is more than one to choose from. Use
the new settingsActivity meta-data to target the appropriate settings activity
for the chosen recognizer.
