OSDN Git Service
Amith Yamasani [Tue, 23 Oct 2012 00:59:10 +0000 (17:59 -0700)]
am
b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '
b80b8bb2535504bada0664a7255b5fa61c2c3947':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
Amith Yamasani [Tue, 23 Oct 2012 00:56:54 +0000 (17:56 -0700)]
Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
Amith Yamasani [Mon, 22 Oct 2012 23:38:02 +0000 (16:38 -0700)]
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
Bug:
7378871
If the timeout choices are empty, set an empty summary.
Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
Baligh Uddin [Mon, 22 Oct 2012 21:01:54 +0000 (14:01 -0700)]
am
a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 20:58:38 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 20:58:21 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 22 Oct 2012 19:09:26 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 19:07:22 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94a7973ca3611509deb3847b4bc211196f12ca30
Auto-generated-cl: translation import
Guang Zhu [Mon, 22 Oct 2012 18:53:23 +0000 (11:53 -0700)]
am
a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
* commit '
a023f4f6404027c3525af2cc48535a208e33b1d8':
Prevent sync state changes when user is a monkey
Guang Zhu [Mon, 22 Oct 2012 18:50:38 +0000 (11:50 -0700)]
Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
Guang Zhu [Sat, 20 Oct 2012 00:55:05 +0000 (17:55 -0700)]
Prevent sync state changes when user is a monkey
Bug:
7385019
Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
Russell Brenner [Sun, 21 Oct 2012 15:05:12 +0000 (08:05 -0700)]
am
56a166e9: Added info about why Wi-Fi is required
* commit '
56a166e9e3cac96246bd724ceea96846fc9e41e1':
Added info about why Wi-Fi is required
Russell Brenner [Sat, 20 Oct 2012 01:55:14 +0000 (18:55 -0700)]
Added info about why Wi-Fi is required
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.
Bug:
7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
John Spurlock [Fri, 19 Oct 2012 18:05:49 +0000 (11:05 -0700)]
am
d983e1d1: Settings: Use new shared dream setting defaults.
* commit '
d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
Settings: Use new shared dream setting defaults.
John Spurlock [Thu, 18 Oct 2012 20:41:09 +0000 (16:41 -0400)]
Settings: Use new shared dream setting defaults.
Bug:
7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
Jeff Sharkey [Fri, 19 Oct 2012 06:26:08 +0000 (23:26 -0700)]
am
5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
More migration to Global settings.
Jeff Sharkey [Fri, 19 Oct 2012 06:23:07 +0000 (23:23 -0700)]
Merge "More migration to Global settings." into jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 01:12:03 +0000 (18:12 -0700)]
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
Romain Guy [Fri, 19 Oct 2012 01:09:48 +0000 (18:09 -0700)]
Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 00:37:43 +0000 (17:37 -0700)]
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
Jeff Sharkey [Thu, 18 Oct 2012 22:38:42 +0000 (15:38 -0700)]
More migration to Global settings.
Bug:
7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
Zhihai Xu [Thu, 18 Oct 2012 22:11:03 +0000 (15:11 -0700)]
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)
Zhihai Xu [Thu, 18 Oct 2012 22:07:48 +0000 (15:07 -0700)]
Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
Zhihai Xu [Thu, 18 Oct 2012 20:03:10 +0000 (13:03 -0700)]
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
Daniel Sandler [Thu, 18 Oct 2012 17:27:04 +0000 (10:27 -0700)]
am
deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
* commit '
deb5a843c9feb39d8ea564347a97417b34a5e9a1':
More descriptive summary for "Sleep Mode" pref.
Daniel Sandler [Thu, 18 Oct 2012 17:24:42 +0000 (10:24 -0700)]
Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
Fabrice Di Meglio [Thu, 18 Oct 2012 17:14:40 +0000 (10:14 -0700)]
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 )
Fabrice Di Meglio [Thu, 18 Oct 2012 17:13:18 +0000 (10:13 -0700)]
Merge "Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
Daniel Sandler [Thu, 18 Oct 2012 14:33:59 +0000 (10:33 -0400)]
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
Baligh Uddin [Thu, 18 Oct 2012 05:37:34 +0000 (22:37 -0700)]
am
f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f6d4b29088eb9c12f144828f905cee64bd4e0358':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 05:35:16 +0000 (22:35 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 18 Oct 2012 05:34:44 +0000 (22:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 18 Oct 2012 05:19:25 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0b02f13e3dd75052d20687605be5856f635aa67
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Oct 2012 05:17:36 +0000 (22:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa1c716ce5a5b1c16ee6b45bb37181f63f13e4a9
Auto-generated-cl: translation import
Brian Muramatsu [Thu, 18 Oct 2012 04:53:32 +0000 (21:53 -0700)]
am
c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
* commit '
c30a6712f266b9d4cf0c68b4a708ae6ae95911f4':
Show regulatory info within a ScrollView
Brian Muramatsu [Thu, 18 Oct 2012 04:51:27 +0000 (21:51 -0700)]
Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
John Huang [Thu, 18 Oct 2012 02:55:48 +0000 (19:55 -0700)]
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)"
John Huang [Thu, 18 Oct 2012 02:53:46 +0000 (19:53 -0700)]
Merge "Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
Casey Burkhardt [Thu, 18 Oct 2012 02:29:33 +0000 (19:29 -0700)]
am
91ecf27a: Correcting content description in Wifi network selection activity. Bug:
7362208
* commit '
91ecf27ab6713fa18be509c9ec4d143789a0ca5f':
Correcting content description in Wifi network selection activity. Bug:
7362208
Irfan Sheriff [Thu, 18 Oct 2012 01:43:37 +0000 (18:43 -0700)]
Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
This reverts commit
0b21b3d725935c03a4ca4ab8476da2b0675a53cd.
Bug:
7366814
Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
Brian Muramatsu [Thu, 18 Oct 2012 01:27:02 +0000 (18:27 -0700)]
Show regulatory info within a ScrollView
Bug
7200143
Some images won't fit in portrait and landscape mode.
Change-Id: I06016ec5dd85db9801120ac20dfedc249e94c20f
Fabrice Di Meglio [Thu, 18 Oct 2012 00:50:05 +0000 (17:50 -0700)]
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
Casey Burkhardt [Wed, 17 Oct 2012 23:50:50 +0000 (16:50 -0700)]
Correcting content description in Wifi network selection activity.
Bug:
7362208
Change-Id: I12a65657e95d1510c388e7f18e0af753f0680533
Zhihai Xu [Wed, 17 Oct 2012 23:35:00 +0000 (16:35 -0700)]
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)
Zhihai Xu [Wed, 17 Oct 2012 23:32:56 +0000 (16:32 -0700)]
Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
Amith Yamasani [Wed, 17 Oct 2012 21:09:06 +0000 (14:09 -0700)]
am
7a1c4cdf: Fix check for multiple users
* commit '
7a1c4cdfae66e8b110de3988e65586871a969c04':
Fix check for multiple users
Zhihai Xu [Wed, 17 Oct 2012 19:35:14 +0000 (12:35 -0700)]
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
Amith Yamasani [Wed, 17 Oct 2012 20:27:19 +0000 (13:27 -0700)]
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
Michael Jurka [Wed, 17 Oct 2012 19:33:17 +0000 (12:33 -0700)]
am
7d078f94: Fix crash when viewing installed app details page
* commit '
7d078f942f51f12bde6dbe1f2acd122f81ed0e07':
Fix crash when viewing installed app details page
Michael Jurka [Wed, 17 Oct 2012 19:08:33 +0000 (21:08 +0200)]
Fix crash when viewing installed app details page
Change-Id: I6b4f644d5208c8ac0254bcc8348b87575c431c06
Baligh Uddin [Wed, 17 Oct 2012 05:02:35 +0000 (22:02 -0700)]
am
8e3f8d3a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8e3f8d3af576648cc73181d3ba2a89c107dffc75':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 17 Oct 2012 05:00:45 +0000 (22:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 17 Oct 2012 04:57:18 +0000 (21:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Vikram Aggarwal [Tue, 16 Oct 2012 22:47:41 +0000 (15:47 -0700)]
Baligh Uddin [Tue, 16 Oct 2012 22:26:58 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ica70679f4072603b62a08f46d26f1625a5820788
Auto-generated-cl: translation import
Baligh Uddin [Tue, 16 Oct 2012 22:25:46 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ide3fcbbe400e9e6663575e2b0c41c1c50b5ed7e9
Auto-generated-cl: translation import
Vikram Aggarwal [Tue, 16 Oct 2012 22:23:01 +0000 (15:23 -0700)]
Remove clock
Bug:
7267695 time on "decrypt storage" page is wrong
Change-Id: I582e758006f0e01aedaffc6c9310d550abb56000
Romain Guy [Tue, 16 Oct 2012 16:46:18 +0000 (09:46 -0700)]
am
891185a4: Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
* commit '
891185a4fa836c1d386eda0667cf34e293380b48':
New developer setting: force 4x MSAA
Romain Guy [Tue, 16 Oct 2012 16:44:58 +0000 (09:44 -0700)]
Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
Baligh Uddin [Tue, 16 Oct 2012 16:31:43 +0000 (09:31 -0700)]
am
a9fada40: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a9fada4069592f2a7053bc049eeebd1330af7e7e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Oct 2012 16:29:04 +0000 (09:29 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 16 Oct 2012 16:28:38 +0000 (09:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Romain Guy [Tue, 16 Oct 2012 02:22:57 +0000 (19:22 -0700)]
New developer setting: force 4x MSAA
Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
Amith Yamasani [Mon, 15 Oct 2012 21:01:21 +0000 (14:01 -0700)]
am
c20e5e34: Align text in Language & input screen
* commit '
c20e5e3450c4ed26a25cca3be8c2a6902fd3dd72':
Align text in Language & input screen
Amith Yamasani [Mon, 15 Oct 2012 20:10:51 +0000 (13:10 -0700)]
Align text in Language & input screen
Bug:
7336478
Change-Id: I38e916e851cbae3284970fe8d8764a6a6018b0ff
Jason Chen [Mon, 15 Oct 2012 06:02:51 +0000 (23:02 -0700)]
am
2b62fcb3: Merge "Let\'s enhance" into jb-mr1-dev
* commit '
2b62fcb3e629b59ed8cfaf26c3b712f8bb9bd352':
Let's enhance
Jason Chen [Mon, 15 Oct 2012 06:01:34 +0000 (23:01 -0700)]
Merge "Let's enhance" into jb-mr1-dev
Dianne Hackborn [Sun, 14 Oct 2012 18:09:38 +0000 (11:09 -0700)]
am
bc3cab99: Merge "Fix issue #
7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev
* commit '
bc3cab99e36e3e757770eaaa02664c1ec193367a':
Fix issue #
7330867: Cannot disable a built-in app if you've downloaded updates
Dianne Hackborn [Sun, 14 Oct 2012 18:07:45 +0000 (11:07 -0700)]
Merge "Fix issue #
7330867: Cannot disable a built-in app if you've downloaded updates" into jb-mr1-dev
Adam Powell [Sat, 13 Oct 2012 08:28:00 +0000 (01:28 -0700)]
am
a5f6762a: Show the overflow in the right place for keyguard settings
* commit '
a5f6762adfe90007be69bab9cfd22515753da82b':
Show the overflow in the right place for keyguard settings
Adam Powell [Sat, 13 Oct 2012 08:20:28 +0000 (01:20 -0700)]
Show the overflow in the right place for keyguard settings
Change-Id: Ie8b2c8acf97736041bf09a64c0f1d77f80350f4c
Dianne Hackborn [Sat, 13 Oct 2012 02:20:09 +0000 (19:20 -0700)]
Fix issue #
7330867: Cannot disable a built-in app if you've downloaded updates
Change-Id: Ie9dfe4a9195e4583bead8066807e4bba8274801f
Jason Chen [Fri, 12 Oct 2012 19:29:43 +0000 (12:29 -0700)]
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
Baligh Uddin [Fri, 12 Oct 2012 20:54:47 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibccc9691d27fec1b597ca3e8fae1d82f6a8943d7
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Oct 2012 20:52:37 +0000 (13:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ecd65d9576631bdd6bb466560a95df76e17ff2b
Auto-generated-cl: translation import
Jim Miller [Fri, 12 Oct 2012 20:21:25 +0000 (13:21 -0700)]
am
afc0036e: Merge "Disable security widgets for now" into jb-mr1-dev
* commit '
afc0036e27d4240a354595b1aa08e8f497995e0c':
Disable security widgets for now
Jim Miller [Fri, 12 Oct 2012 20:20:15 +0000 (13:20 -0700)]
Merge "Disable security widgets for now" into jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 16:16:26 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 12 Oct 2012 16:15:00 +0000 (09:15 -0700)]
am
acc0e56e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
acc0e56ea768f13ffa0e6303c658a9a2fb142d14':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Oct 2012 16:14:10 +0000 (09:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 03:22:24 +0000 (20:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab3d6f1b9911ed3b1ef2472e083a3f55faa4a474
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Oct 2012 03:20:41 +0000 (20:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9c7e11980c3a96767486303dd786f031c6d9b37
Auto-generated-cl: translation import
Amith Yamasani [Fri, 12 Oct 2012 01:27:53 +0000 (18:27 -0700)]
am
9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
* commit '
9b8055b337c5b3efe80d87d318bf0d1df67ecf14':
Fix a regression in exiting the activity on picking a locale
Amith Yamasani [Fri, 12 Oct 2012 01:25:40 +0000 (18:25 -0700)]
Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
Amith Yamasani [Thu, 11 Oct 2012 18:54:44 +0000 (11:54 -0700)]
am
35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
* commit '
35bbbc6ca40c93c4174f426be295ea912aad82e0':
Launch account addition activity from Settings instead of from AccountManager
Amith Yamasani [Thu, 11 Oct 2012 18:51:34 +0000 (11:51 -0700)]
Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
Dianne Hackborn [Thu, 11 Oct 2012 18:26:55 +0000 (11:26 -0700)]
am
85badb09: Merge "Fix issue #
7328934: change threshold of developer options countdown toast" into jb-mr1-dev
* commit '
85badb09a5489d29ea5c916f38c2c09288d9ba56':
Fix issue #
7328934: change threshold of developer options countdown toast
Dianne Hackborn [Thu, 11 Oct 2012 18:25:28 +0000 (11:25 -0700)]
Merge "Fix issue #
7328934: change threshold of developer options countdown toast" into jb-mr1-dev
Dianne Hackborn [Thu, 11 Oct 2012 18:03:36 +0000 (11:03 -0700)]
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
Charles Chen [Thu, 11 Oct 2012 17:28:54 +0000 (10:28 -0700)]
am
ac15b48b: Merge "Fix accessibility gesture summary text." into jb-mr1-dev
* commit '
ac15b48b2b18a3096fa596fdc6f9308047f3e694':
Fix accessibility gesture summary text.
Charles Chen [Thu, 11 Oct 2012 17:27:06 +0000 (10:27 -0700)]
Merge "Fix accessibility gesture summary text." into jb-mr1-dev
Amith Yamasani [Thu, 11 Oct 2012 05:28:19 +0000 (22:28 -0700)]
am
4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
* commit '
4465bbb7e14020e10620cda70fc51896b57ced67':
Fix crash in Settings for secondary users
Amith Yamasani [Thu, 11 Oct 2012 05:27:03 +0000 (22:27 -0700)]
Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 04:49:07 +0000 (21:49 -0700)]
am
73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
73d49b3bd996f38115ea47a51d54241aee55e9de':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Oct 2012 04:47:57 +0000 (21:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 11 Oct 2012 04:47:05 +0000 (21:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Amith Yamasani [Thu, 11 Oct 2012 04:41:12 +0000 (21:41 -0700)]
Fix crash in Settings for secondary users
Bug:
7328485
Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
Amith Yamasani [Thu, 11 Oct 2012 02:45:15 +0000 (19:45 -0700)]
Fix a regression in exiting the activity on picking a locale
Bug:
7326748
Change-Id: I5db57c805c104bf01c256f65990aec6deae27789
Jeff Sharkey [Thu, 11 Oct 2012 00:01:49 +0000 (17:01 -0700)]
am
84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev
* commit '
84b90d533275be792954efc37e14f0c8fd409681':
Switch to IPackageManager.getServiceInfo().
Jeff Sharkey [Wed, 10 Oct 2012 23:59:47 +0000 (16:59 -0700)]
Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev