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
Russell Brenner
553074f0fc
Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
2012-10-10 10:31:59 -07:00
Amith Yamasani
7f2824b924
Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
2012-10-10 10:31:59 -07:00
Amith Yamasani
ef6172304b
Go back to top of list when Settings is relaunched
...
Also fixes slight movements when coming back from Add account.
Bug: 7312513
Bug: 7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
2012-10-09 16:57:25 -07:00
Irfan Sheriff
1de6b8b648
am f3153e3b: am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
...
* commit 'f3153e3b232a0f5af9c91372df1d9ef938e6f25d':
Have poor network avoidance turned off by default
2012-10-09 16:37:14 -07:00
Irfan Sheriff
a92f380f86
Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
2012-10-09 16:32:25 -07:00
Irfan Sheriff
ba50175b1c
Have poor network avoidance turned off by default
...
Bug: 7318044
Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9
2012-10-09 16:18:36 -07:00
Russell Brenner
3067fbce2e
Return RESULT_OK when wifi connection established
...
Two new exit points were not setting a return result. Since the
default result for an activity is RESULT_CANCEL, Setup Wizard was
continuing as if no connection was made.
Bug: 7298234
Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
2012-10-09 16:17:12 -07:00
Svetoslav Ganov
04aa39907c
am e002c0f0: am f04ac7ee: am a1e406b5: Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev
...
* commit 'e002c0f088e1bbf6f730ecbf79f29f330ceaa345':
Accessibility settings should update after gesture to enable accessibility.
2012-10-08 16:41:37 -07:00
Svetoslav Ganov
a1e406b58e
Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev
2012-10-08 16:35:52 -07:00
Svetoslav Ganov
1f81c0542e
Accessibility settings should update after gesture to enable accessibility.
...
1. We have added a global gesture to enable accessibility which is long press
on power follower by a long press with two fingers. If this gesture is
performed when accessibility settings 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: I45851d7789e24e9e0a5bc5aaac39db9a12b60e0c
2012-10-08 16:03:34 -07:00
Vikram Aggarwal
f5558bb1c0
am 563e4506: am 902ad875: am 86508085: Remove further logging
...
* commit '563e45063092ab1e2e722cae60a07a58f32ac4de':
Remove further logging
2012-10-08 13:38:10 -07:00
Vikram Aggarwal
86508085ea
Remove further logging
...
Bug: 7302014 CryptKeeper logs PII data
Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
2012-10-08 12:59:54 -07:00
Jake Hamby
c71d0505b9
am 58f59428: am 837bb033: am 283dce21: Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
...
* commit '58f594284efb98737f5435b8463ab0e28895fe60':
Allow disconnected BT profiles to be unchecked in Settings.
2012-10-08 12:19:46 -07:00
Jake Hamby
283dce21b4
Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
2012-10-08 12:13:14 -07:00
Vikram Aggarwal
ab462aebec
am f36ebae7: am 075dfeaa: am c3ebad20: Remove verbose logging
...
* commit 'f36ebae7a29387452af71730767aba6a00f23094':
Remove verbose logging
2012-10-08 10:57:18 -07:00