Jeff Sharkey
9d0fbd728e
am 5a740ab1
: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
More migration to Global settings.
2012-10-18 23:25:23 -07:00
Jeff Sharkey
5a740ab1b9
Merge "More migration to Global settings." into jb-mr1-dev
2012-10-18 23:23:08 -07:00
Romain Guy
7caa7515f8
am 8b982465
: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
...
* commit '8b98246559c7422e507458a63c8dfc2783bd0afc':
Control OpenGL traces from Developer Options in Settings
2012-10-18 18:12:00 -07:00
Romain Guy
8b98246559
Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
2012-10-18 18:09:49 -07:00
Romain Guy
025cafcfa1
Control OpenGL traces from Developer Options in Settings
...
This change adds a new entry to the developer options screen in
settings that lets you choose what OpenGL traces you want.
Change-Id: Ie789fa20dbbabee1e509b697106072464e9f9d2b
2012-10-18 17:37:43 -07:00
Jeff Sharkey
860eceba2c
More migration to Global settings.
...
Bug: 7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
2012-10-18 15:38:42 -07:00
Zhihai Xu
ac8cfd0b9c
am 8346107d
: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
...
* commit '8346107d25a05580fa98adaaff9d28c025d3faed':
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
2012-10-18 15:09:45 -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
8b6036c3fb
am deb5a843
: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
...
* commit 'deb5a843c9feb39d8ea564347a97417b34a5e9a1':
More descriptive summary for "Sleep Mode" pref.
2012-10-18 10:27:04 -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
Fabrice Di Meglio
17edbf38d7
am c14d1134
: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
...
* commit 'c14d1134a06324ece490f7ace3337c692b2ea542':
Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
2012-10-18 10:14:35 -07:00
Fabrice Di Meglio
c14d1134a0
Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
2012-10-18 10:13:18 -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
Baligh Uddin
67a54eaa81
am f6d4b290
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f6d4b29088eb9c12f144828f905cee64bd4e0358':
Import translations. DO NOT MERGE
2012-10-17 22:40:07 -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
0bfd02b05e
am c30a6712
: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
...
* commit 'c30a6712f266b9d4cf0c68b4a708ae6ae95911f4':
Show regulatory info within a ScrollView
2012-10-17 21:53:36 -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
ff11f09af0
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 '5002303399341d7d442856a30df9080b896d7c55':
Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
2012-10-17 19:55:32 -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
Casey Burkhardt
7367bb2a31
am 91ecf27a
: Correcting content description in Wifi network selection activity. Bug: 7362208
...
* commit '91ecf27ab6713fa18be509c9ec4d143789a0ca5f':
Correcting content description in Wifi network selection activity. Bug: 7362208
2012-10-17 19:29:08 -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
Fabrice Di Meglio
9051e3cd78
Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
...
- use "viewStart" as text alignment
Change-Id: Iaff5eec130fcb57e8352f16f87faaf3bd980e994
2012-10-17 17:50:05 -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
57569b4080
am 6ec44ff0
: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
...
* commit '6ec44ff0642bdca94c12f849552aa101e93313b9':
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
2012-10-17 16:35:14 -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
89e93c97d5
am 7a1c4cdf
: Fix check for multiple users
...
* commit '7a1c4cdfae66e8b110de3988e65586871a969c04':
Fix check for multiple users
2012-10-17 14:09:24 -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
eabe82d032
am 7d078f94
: Fix crash when viewing installed app details page
...
* commit '7d078f942f51f12bde6dbe1f2acd122f81ed0e07':
Fix crash when viewing installed app details page
2012-10-17 12:33: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
Baligh Uddin
3441d4ac6a
am 8e3f8d3a
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8e3f8d3af576648cc73181d3ba2a89c107dffc75':
Import translations. DO NOT MERGE
2012-10-17 11:09:40 -07:00
Baligh Uddin
8e3f8d3af5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 22:00:46 -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
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
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
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
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
Baligh Uddin
acc0e56ea7
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-12 09:14:11 -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