PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,299 Commits 1 Branch 0 Tags
4fed5a3a8ed342006917ca657d2c99c1b72e3901
Commit Graph

8299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
4fed5a3a8e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 07:00:03 -07:00
Baligh Uddin
f6d4b29088 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-17 22:35:17 -07:00
Baligh Uddin
076140897f Import translations. DO NOT MERGE 
Change-Id: Ia0b02f13e3dd75052d20687605be5856f635aa67
Auto-generated-cl: translation import
 2012-10-17 22:19:25 -07:00
Brian Muramatsu
c30a6712f2 Merge "Show regulatory info within a ScrollView" into jb-mr1-dev 2012-10-17 21:51:28 -07:00
John Huang
5002303399 Merge "Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev 2012-10-17 19:53:47 -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
Brian Muramatsu
62ebbbc0de Show regulatory info within a ScrollView 
Bug 7200143

Some images won't fit in portrait and landscape mode.

Change-Id: I06016ec5dd85db9801120ac20dfedc249e94c20f
 2012-10-17 18:27:02 -07:00
Casey Burkhardt
91ecf27ab6 Correcting content description in Wifi network selection activity. 
Bug: 7362208

Change-Id: I12a65657e95d1510c388e7f18e0af753f0680533
 2012-10-17 16:52:52 -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
The Android Automerger
93f6219937 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 16:07:40 -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
Michael Jurka
7d078f942f Fix crash when viewing installed app details page 
Change-Id: I6b4f644d5208c8ac0254bcc8348b87575c431c06
 2012-10-17 21:08:33 +02:00
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
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
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
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
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