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 '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 '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
It worked with language+country resources but for some resources it's just language.
Added a check to see if we had lanugage+country before deciding which to use.
bug:2605981
Change-Id: Icb667a51f0c376f5188e3a43f264e236cd265468
When scan fails for 3 times, we show a
failure toast and continue to scan.
In one case this caused infinite toasts,
until the user stopped wifi.
Its not clear what can cause this kind of
a state since wifi disable broadcast should
stop the scans. This fix will stop scans
after 3 continuous failures. Any wifi state
change will restart scan.
Bug: 2601937
Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c
Merge commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48' into kraken
* commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48':
Grey out wifi tethering in airplane mode
When airplane mode is enabled, wifi tethering
should be disabled since there is no real
use case for it.
This also addresses the issue
of trying to restore Wifi (with tethering on)
when airplane mode is disabled.
Bug: 2594720
Change-Id: I7379ebed74a58b148ae82ed589d09aa2b9ca767d
