Merge commit '542b8f2b471cbac5a2f4b550eae65caf24266d36' into kraken
* commit '542b8f2b471cbac5a2f4b550eae65caf24266d36':
Fixing Swedish translations of a few texts under "Phone info".
Merge commit '0b53ac733c36e14a5e2e948393360bba00048ccb' into kraken
* commit '0b53ac733c36e14a5e2e948393360bba00048ccb':
The password in the APN settings is shown instead of stars
Merge commit '15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken
* commit '15bb47545686395c0d94b54dd67c4f080fe625e5':
b/2652059 Refresh UI after bond state change
Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp
* commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2':
b/2652059 Refresh UI after bond state change
Merge commit '3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken
* commit '3a1204f7cd231ed1c451ca90901eae082541b9ef':
b/2630339 Fixed the crash when an app requests BT to be enabled
Merge commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp
* commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e':
b/2630339 Fixed the crash when an app requests BT to be enabled
For AlertActivity, the dialog needs to display at onCreate() time.
Otherwise, the decor view would be made. Trying to display the
dialog afterward would crash. Changed to AlertDialog instead.
Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
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 '0bca1653cb78693e2c892efb48b944ddad98b66d' into kraken
* commit '0bca1653cb78693e2c892efb48b944ddad98b66d':
b/2608693 Fix the problem where BT was automatically reconnecting
Merge commit '6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp
* commit '6368b25c09992172b1900da3fd326c4fd2fdd203':
b/2608693 Fix the problem where BT was automatically reconnecting
Merge commit 'b12b21a5b02468d601190de23f91675973ead44d' into kraken
* commit 'b12b21a5b02468d601190de23f91675973ead44d':
Fix string for uninstall button for system apps.
Merge commit 'b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp
* commit 'b99e029db14ae276a47da39da9378b6af9aef403':
Fix string for uninstall button for system apps.
Merge commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b' into kraken
* commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b':
Enable moving packages when install location is set to auto.
Merge commit 'a3683a51faab316c1577cd13c708a41938bcc646' into froyo-plus-aosp
* commit 'a3683a51faab316c1577cd13c708a41938bcc646':
Enable moving packages when install location is set to auto.
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.
Merge commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b' into froyo-plus-aosp
* commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b':
Fix the tethering help page.
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
