The Android Automerger
3fb1f94860
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 06:59:59 -07:00
Baligh Uddin
8e3f8d3af5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 22:00:46 -07:00
The Android Automerger
676f4457de
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 17:31:09 -07:00
Baligh Uddin
808b74f76e
Import translations. DO NOT MERGE
...
Change-Id: Ica70679f4072603b62a08f46d26f1625a5820788
Auto-generated-cl: translation import
2012-10-16 15:26:58 -07:00
Vikram Aggarwal
f487e2ade0
Remove clock
...
Bug: 7267695 time on "decrypt storage" page is wrong
Change-Id: I582e758006f0e01aedaffc6c9310d550abb56000
2012-10-16 15:23:19 -07:00
Romain Guy
891185a4fa
Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
2012-10-16 09:44:59 -07:00
Baligh Uddin
a9fada4069
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 09:29:04 -07:00
The Android Automerger
87a620a304
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 07:00:00 -07:00
Romain Guy
6a9a3e765a
New developer setting: force 4x MSAA
...
Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
2012-10-15 19:22:57 -07:00
Amith Yamasani
c20e5e3450
Align text in Language & input screen
...
Bug: 7336478
Change-Id: I38e916e851cbae3284970fe8d8764a6a6018b0ff
2012-10-15 13:34:13 -07:00
The Android Automerger
daabb12933
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:31:25 -07:00
The Android Automerger
ddddcddae5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-15 06:59:45 -07:00
Jason Chen
2b62fcb3e6
Merge "Let's enhance" into jb-mr1-dev
2012-10-14 23:01:35 -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
The Android Automerger
d1d08621c5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-13 03:50:23 -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
The Android Automerger
aa0e45c8ed
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 16:34:40 -07:00
The Android Automerger
1c0ee7e1ee
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 16:33:00 -07:00
Jason Chen
6e0e3e5145
Let's enhance
...
Add mipmap-xxhdpi launcher icon asset.
Remove unneeded drawable-based launcher icon assets while we're at it.
Bug: 6718166
Change-Id: I0f9ed4968569e0c2bce44e617a0586f0672d916a
2012-10-12 16:23:10 -07:00
Baligh Uddin
ec9bcadd28
Import translations. DO NOT MERGE
...
Change-Id: Ibccc9691d27fec1b597ca3e8fae1d82f6a8943d7
Auto-generated-cl: translation import
2012-10-12 13:54:47 -07:00
Jim Miller
afc0036e27
Merge "Disable security widgets for now" into jb-mr1-dev
2012-10-12 13:20:16 -07:00
The Android Automerger
016d448a65
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 11:50:19 -07:00
The Android Automerger
e636a9525d
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 10:27:25 -07:00
Baligh Uddin
acc0e56ea7
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-12 09:14:11 -07:00
The Android Automerger
0ac02879e2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 06:59:44 -07:00
Baligh Uddin
b07c809caf
Import translations. DO NOT MERGE
...
Change-Id: Iab3d6f1b9911ed3b1ef2472e083a3f55faa4a474
Auto-generated-cl: translation import
2012-10-11 20:22:24 -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
The Android Automerger
e437c664b9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:27:00 -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
Charles Chen
ac15b48b2b
Merge "Fix accessibility gesture summary text." into jb-mr1-dev
2012-10-11 10:27:06 -07:00
The Android Automerger
1b333afbe5
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:19:47 -07:00
The Android Automerger
02e209a93e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 07:04:18 -07:00
Amith Yamasani
4465bbb7e1
Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
2012-10-10 22:27:04 -07:00
Baligh Uddin
73d49b3bd9
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-10 21:47:57 -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
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
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
Baligh Uddin
2625b9c106
Import translations. DO NOT MERGE
...
Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61
Auto-generated-cl: translation import
2012-10-10 15:28:23 -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
33080be20a
Merge "Use user-specific PackageManager." into jb-mr1-dev
2012-10-10 14:29:08 -07:00
Svetoslav Ganov
289a339629
Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
2012-10-10 14:16:50 -07:00
