Commit Graph

4350 Commits

Author SHA1 Message Date
Zhihai Xu
10307b99dc am ecb7f618: am 3e1e454b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit 'ecb7f618576300e5d729c1aab2938169634f0d33':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
2012-10-18 15:15:49 -07:00
Zhihai Xu
8346107d25 Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 2012-10-18 15:07:49 -07:00
Zhihai Xu
ec16c0ae42 bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
The root cause is normally when change the airplane mode, the bluetooth setting UI
 will not be foreground. No listener is setup for bluetooth setting UI when it is
 in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
 won't be called. But for manta, airplane mode setting and bluetooth setting UI both
 will show on the foreground due to bigger screen size. When we turn ariplane mode on,
 bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
 But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
 bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
 which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
 being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
 to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
 due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.
 Don't need to consider thread synchronization, because everything is running on the main thread.

bug 7366814

Change-Id: I138d1904df6cb17c7828295caa51a7d80abf99f2
2012-10-18 13:03:10 -07:00
Daniel Sandler
e18099d769 am 6749fb88: am 260e34b2: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
* commit '6749fb88efaacf1e1de23fd170d0797562101aee':
  More descriptive summary for "Sleep Mode" pref.
2012-10-18 10:31:36 -07:00
Daniel Sandler
deb5a843c9 Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev 2012-10-18 10:24:42 -07:00
Daniel Sandler
c825bc8e17 More descriptive summary for "Sleep Mode" pref.
It will either show "Off" or the name of the selected dream.

Also, move "When to sleep" out onto the visible part of the
action bar if there's room, making it much easier to discover.

Bug: 7320701
Change-Id: I1d4e2c17b764b8ee054dbb17c23f559d735e3450
2012-10-18 11:38:28 -04:00
John Huang
e324f43d6a am 5a8b0b82: am c58479ec: am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
* commit '5a8b0b8276701ee230ad6f02c8474dd05a67c595':
  Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
2012-10-17 20:00:52 -07:00
Irfan Sheriff
4aaebfe591 Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
This reverts commit 0b21b3d725.
Bug: 7366814

Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
2012-10-17 18:45:42 -07:00
Zhihai Xu
4d71d5d4cf am 933bef3d: am 8d08bc53: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '933bef3db03d25ba430139ef9bdb12369a70661b':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
2012-10-17 16:38:48 -07:00
Zhihai Xu
6ec44ff064 Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev 2012-10-17 16:32:57 -07:00
Amith Yamasani
780136f202 am fca149f2: am c45f88ea: am 7a1c4cdf: Fix check for multiple users
* commit 'fca149f25859a902506cd449ed73fe54c0fad740':
  Fix check for multiple users
2012-10-17 14:13:47 -07:00
Zhihai Xu
0b21b3d725 bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
The root cause is normally when change the airplane mode, the bluetooth setting UI
 will not be foreground. No listener is setup for bluetooth setting UI when it is
 in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
 won't be called. But for manta, airplane mode setting and bluetooth setting UI both
 will show on the foreground due to bigger screen size. When we turn ariplane mode on,
 bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
 But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
 bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
 which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
 being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
 to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
 due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.

bug 7366814
Change-Id: I07d4a2dfe03fc6775cfeabb28cd3a0cc1fded44e
2012-10-17 13:57:43 -07:00
Amith Yamasani
7a1c4cdfae Fix check for multiple users
Bug: 7365839

Remove the Uninstall for all users option if less than 2 users on the device.

Change-Id: I5d2d853e05e1d505b67f8b83b1d5ea7f9c6e7215
2012-10-17 13:36:21 -07:00
Romain Guy
b86c2e54a2 am fd0a3d08: am a1090b41: am 891185a4: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
* commit 'fd0a3d08238c6c924e702266da58e3d8f512a94c':
  New developer setting: force 4x MSAA
2012-10-16 09:49:10 -07:00
Romain Guy
6a9a3e765a New developer setting: force 4x MSAA
Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
2012-10-15 19:22:57 -07:00
Dianne Hackborn
c76ceba9ca am 31d866e1: am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev
* commit '31d866e1c612d2391e8b279addd052ac779c503b':
  Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
2012-10-14 11:13:20 -07:00
Dianne Hackborn
bc3cab99e3 Merge "Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates" into jb-mr1-dev 2012-10-14 11:07:46 -07:00
Adam Powell
e19424f29d am fcf460eb: am cc7f6e92: am a5f6762a: Show the overflow in the right place for keyguard settings
* commit 'fcf460eb874953fd663711fe7d6164f700d181ae':
  Show the overflow in the right place for keyguard settings
2012-10-13 01:32:22 -07:00
Adam Powell
a5f6762adf Show the overflow in the right place for keyguard settings
Change-Id: Ie8b2c8acf97736041bf09a64c0f1d77f80350f4c
2012-10-13 01:20:28 -07:00
Dianne Hackborn
9072d9efc6 Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
Change-Id: Ie9dfe4a9195e4583bead8066807e4bba8274801f
2012-10-12 19:20:09 -07:00
Jim Miller
6b3bb24fc0 am 0b0f1ea2: am 17963414: am afc0036e: Merge "Disable security widgets for now" into jb-mr1-dev
* commit '0b0f1ea2c25e7c68e60ab64e2adeb2cca24173a7':
  Disable security widgets for now
2012-10-12 13:26:42 -07:00
Jim Miller
afc0036e27 Merge "Disable security widgets for now" into jb-mr1-dev 2012-10-12 13:20:16 -07:00
Amith Yamasani
b417ffc768 am a6b3ecbe: am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
* commit 'a6b3ecbebfa2d5de7525184747116edaea1c148f':
  Fix a regression in exiting the activity on picking a locale
2012-10-12 11:10:31 -07:00
Amith Yamasani
9b8055b337 Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev 2012-10-11 18:25:41 -07:00
Amith Yamasani
8d7148c4d5 am 33e8e04d: am 552bebe0: am 35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
* commit '33e8e04d844713f59ca0193bb93f8ae9bedbe72c':
  Launch account addition activity from Settings instead of from AccountManager
2012-10-11 17:17:57 -07:00
Dianne Hackborn
59fde8ef9d am 2ab44c07: am 4d35affe: am 85badb09: Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev
* commit '2ab44c0711743ab64bd55208b7fc97bfa954a053':
  Fix issue #7328934: change threshold of developer options countdown toast
2012-10-11 17:17:55 -07:00
Amith Yamasani
35bbbc6ca4 Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev 2012-10-11 11:51:35 -07:00
Dianne Hackborn
85badb09a5 Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev 2012-10-11 11:25:29 -07:00
Dianne Hackborn
d6a24d505a Fix issue #7328934: change threshold of developer options countdown toast
Delay showing toasts until the third tap.  Also harden the dev
settings code that pokes system property changes to not crash
if a system service throws an exception back.

Change-Id: I1351e2c950f2bcc4fc72afb60995fd7f84319e3d
2012-10-11 11:07:05 -07:00
Amith Yamasani
7ce98e0dac am 3021168d: am 01f76885: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
* commit '3021168d06bb891f38b212d3338e8397b898b25d':
  Fix crash in Settings for secondary users
2012-10-10 22:32:02 -07:00
Amith Yamasani
b99f864d3f Fix crash in Settings for secondary users
Bug: 7328485

Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
2012-10-10 21:44:15 -07:00
Amith Yamasani
53b14f57c3 Fix a regression in exiting the activity on picking a locale
Bug: 7326748
Change-Id: I5db57c805c104bf01c256f65990aec6deae27789
2012-10-10 19:45:15 -07:00
Jeff Sharkey
26efca3cc6 am 58288c43: am f4e7417e: am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev
* commit '58288c43eca41e93b7e183802cedca920b44055f':
  Switch to IPackageManager.getServiceInfo().
2012-10-10 17:23:28 -07:00
Jeff Sharkey
5a317d7e3e am c2a47691: am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
* commit 'c2a4769197a520e36d2cfe6911f669ee1a9bb63c':
  Move lockscreen to using haptic feedback setting.
2012-10-10 17:23:04 -07:00
Jeff Sharkey
84b90d5332 Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 2012-10-10 16:59:48 -07:00
Amith Yamasani
cbabf19cbb Launch account addition activity from Settings instead of from AccountManager
This enables us to watch for failure cases from certain authenticators that
misbehave.

Bug: 7318390
Change-Id: I43398e7622214cabd1d1bf171502c6a988af00a3
2012-10-10 16:42:20 -07:00
Jeff Sharkey
2264a64331 Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 2012-10-10 16:27:27 -07:00
Jeff Sharkey
0e092f4eb0 Switch to IPackageManager.getServiceInfo().
Bug: 7095093
Change-Id: I79b9f077c9d69c5629b7dd0071a11ccda50839cd
2012-10-10 16:20:46 -07:00
Dianne Hackborn
6f5f824cd1 am bc33d43c: am a2638d3e: am af0cea0a: Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev
* commit 'bc33d43cc175fdbbe096729617a731a99de9ecc2':
  Fix issue #7318666: hide developer options from user build
2012-10-10 15:59:15 -07:00
Dianne Hackborn
af0cea0a21 Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev 2012-10-10 15:53:57 -07:00
Jeff Sharkey
e656031ff8 Move lockscreen to using haptic feedback setting.
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.

Bug: 7318772
Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
2012-10-10 15:38:58 -07:00
Michael Jurka
1a6e3e175d Disable security widgets for now
Change-Id: Ia4627d697514c4029fb0fb3250d674ed25495f97
2012-10-11 00:07:38 +02:00
Dianne Hackborn
caefa9b5f0 Fix issue #7318666: hide developer options from user build
Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
2012-10-10 15:05:42 -07:00
Jeff Sharkey
7d20d459a7 am 2737b449: am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev
* commit '2737b4492e20a92700f54209de55f8bae2c401f0':
  Use user-specific PackageManager.
2012-10-10 14:34:14 -07:00
Jeff Sharkey
33080be20a Merge "Use user-specific PackageManager." into jb-mr1-dev 2012-10-10 14:29:08 -07:00
Svetoslav Ganov
b815878f2c am 283291b7: am ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
* commit '283291b78982604690e4150b5f6cab9a2bbcfc1e':
  Accessibility enabled by gesture not reflected in settings screen.
2012-10-10 14:24:23 -07:00
Svetoslav Ganov
849d64bc1d Accessibility enabled by gesture not reflected in settings screen.
1. We have added a global gesture to enable accessibility which is long press
   on power followed by a long press with two fingers. If this gesture is
   performed when the settings for an accessibility service are on the screen,
   accessibility and the screen-reader are enabled while the UI does not reflect
   that and the user may try to enable the already enabled screen-reader which
   will show two irrelevant warning dialogs - one for enabling the screen-reader
   and one for enabling explore by touch (assuming the screen-reader requests it).
   This change adds a simple content observer for the relevant accessibility
   settings which upon a change calls the functions to refresh the settings UI.

bug:7309127

Change-Id: I214c64877086eeb1fe156bcc195aa4e2931d6bdb
2012-10-10 13:50:40 -07:00
Jeff Sharkey
7cb4780870 Use user-specific PackageManager.
Bug: 7095093
Change-Id: Ia97065d4bdf5203372b76b62a6dfd72858892234
2012-10-10 13:10:23 -07:00
Russell Brenner
f3bc6c939f am 18be472e: am 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
* commit '18be472ef46d2320a98173a6d68d9d62b60b6ccc':
  Return RESULT_OK when wifi connection established
2012-10-10 10:36:58 -07:00
Amith Yamasani
d36e524206 am 86ac45c1: am fee5c228: am 7f2824b9: Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
* commit '86ac45c13aebcd5b368d7571c6f1fc433d1a71c8':
  Go back to top of list when Settings is relaunched
2012-10-10 10:36:57 -07:00