Baligh Uddin
17d6b95fa8
am 825b7012
: am f6d4b290
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '825b70129ac3a26e6912fa6c2553a4a7913557ec':
Import translations. DO NOT MERGE
2012-10-17 22:39:29 -07:00
Baligh Uddin
825b70129a
am f6d4b290
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f6d4b29088eb9c12f144828f905cee64bd4e0358':
Import translations. DO NOT MERGE
2012-10-17 22:37:34 -07:00
Baligh Uddin
b41c3f6113
am 342bb26b
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '342bb26b0d06ded2d08f1d5956b332fdc544e5dd':
Import translations. DO NOT MERGE
2012-10-17 22:36:31 -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
342bb26b0d
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-17 22:34:44 -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
Baligh Uddin
fed707d180
Import translations. DO NOT MERGE
...
Change-Id: Ifa1c716ce5a5b1c16ee6b45bb37181f63f13e4a9
Auto-generated-cl: translation import
2012-10-17 22:17:36 -07:00
Brian Muramatsu
3ce0c0bdaf
am 326489ee
: am c30a6712
: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
...
* commit '326489ee0ceaba2f12c1aeb2d81d6d1efdc80a00':
Show regulatory info within a ScrollView
2012-10-17 21:55:26 -07:00
Brian Muramatsu
326489ee0c
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:32 -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
5a8b0b8276
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 'c58479ec8aaf3354afc6ed4b6c24f2f5019e3dfb':
Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
2012-10-17 19:57:48 -07:00
John Huang
c58479ec8a
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:48 -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
c17358f5dd
am ca879740
: am 91ecf27a
: Correcting content description in Wifi network selection activity. Bug: 7362208
...
* commit 'ca879740509a4d44f3e0ac2f70ac5dfcb8b8af08':
Correcting content description in Wifi network selection activity. Bug: 7362208
2012-10-17 19:31:25 -07:00
Casey Burkhardt
ca87974050
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:33 -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
933bef3db0
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 '8d08bc5331b3bc56ffcc6732f07620deb8f314dc':
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
2012-10-17 16:37:15 -07:00
Zhihai Xu
8d08bc5331
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:00 -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
fca149f258
am c45f88ea
: am 7a1c4cdf
: Fix check for multiple users
...
* commit 'c45f88ea5fcfdb77ad2c77928abc828373050b34':
Fix check for multiple users
2012-10-17 14:12:04 -07:00
Amith Yamasani
c45f88ea5f
am 7a1c4cdf
: Fix check for multiple users
...
* commit '7a1c4cdfae66e8b110de3988e65586871a969c04':
Fix check for multiple users
2012-10-17 14:09:06 -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
3ac0a3f1cd
am beb24cce
: am 7d078f94
: Fix crash when viewing installed app details page
...
* commit 'beb24cce3867f41a5df980906df9ffd57aae9cef':
Fix crash when viewing installed app details page
2012-10-17 12:35:33 -07:00
Michael Jurka
beb24cce38
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:17 -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
6f5fc1ae80
am b09626cf
: am 8e3f8d3a
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b09626cf2086b0eb61ccb03f56025a8e5ae18a2d':
Import translations. DO NOT MERGE
2012-10-16 22:05:05 -07:00
Baligh Uddin
b09626cf20
am 8e3f8d3a
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8e3f8d3af576648cc73181d3ba2a89c107dffc75':
Import translations. DO NOT MERGE
2012-10-16 22:02:35 -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
cd80f53c16
am ff45b71a
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'ff45b71a8930840f93a1c650e34226bf52f3e697':
Import translations. DO NOT MERGE
2012-10-16 21:58:29 -07:00
Baligh Uddin
ff45b71a89
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 21:57:18 -07:00
Vikram Aggarwal
6e69b8ad02
am 478bac83
: am f487e2ad
: Remove clock
...
* commit '478bac83ffab9b8f840f74d627f399e7a44b1309':
Remove clock
2012-10-16 15:49:39 -07:00
Vikram Aggarwal
478bac83ff
am f487e2ad
: Remove clock
...
* commit 'f487e2ade0fe222b21ff85ed47789c51209f5965':
Remove clock
2012-10-16 15:47:41 -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
Baligh Uddin
ad9ae205c8
Import translations. DO NOT MERGE
...
Change-Id: Ide3fcbbe400e9e6663575e2b0c41c1c50b5ed7e9
Auto-generated-cl: translation import
2012-10-16 15:25:46 -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
fd0a3d0823
am a1090b41
: am 891185a4
: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
...
* commit 'a1090b417afff240ef448b4af167541fd7d06ff0':
New developer setting: force 4x MSAA
2012-10-16 09:47:37 -07:00
Romain Guy
a1090b417a
am 891185a4
: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
...
* commit '891185a4fa836c1d386eda0667cf34e293380b48':
New developer setting: force 4x MSAA
2012-10-16 09:46:18 -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
5db3e78931
am bd7c4d94
: am a9fada40
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'bd7c4d9493ce3e80658db0a9af978e9ee6f810b8':
Import translations. DO NOT MERGE
2012-10-16 09:35:00 -07:00
Baligh Uddin
62323cd60b
am ae101baf
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'ae101baf6960ce70f4acb33cfe1e68bf3c50c5a7':
Import translations. DO NOT MERGE
2012-10-16 09:31:59 -07:00
Baligh Uddin
bd7c4d9493
am a9fada40
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a9fada4069592f2a7053bc049eeebd1330af7e7e':
Import translations. DO NOT MERGE
2012-10-16 09:31:43 -07:00
Baligh Uddin
a9fada4069
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 09:29:04 -07:00
Baligh Uddin
ae101baf69
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 09:28:39 -07:00
Romain Guy
6a9a3e765a
New developer setting: force 4x MSAA
...
Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
2012-10-15 19:22:57 -07:00
Amith Yamasani
2d6bff1fb6
am bb9b54bb
: am c20e5e34
: Align text in Language & input screen
...
* commit 'bb9b54bba66c38734007f8f405fa8e556d6bab96':
Align text in Language & input screen
2012-10-15 14:02:38 -07:00
Amith Yamasani
bb9b54bba6
am c20e5e34
: Align text in Language & input screen
...
* commit 'c20e5e3450c4ed26a25cca3be8c2a6902fd3dd72':
Align text in Language & input screen
2012-10-15 14:01:21 -07:00
Amith Yamasani
c20e5e3450
Align text in Language & input screen
...
Bug: 7336478
Change-Id: I38e916e851cbae3284970fe8d8764a6a6018b0ff
2012-10-15 13:34:13 -07:00