OSDN Git Service
The Android Automerger [Fri, 19 Oct 2012 22:46:29 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
The Android Automerger [Fri, 19 Oct 2012 14:00:05 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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: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: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: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: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
The Android Automerger [Thu, 18 Oct 2012 14:00:03 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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:19:25 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0b02f13e3dd75052d20687605be5856f635aa67
Auto-generated-cl: translation import
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: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
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: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
The Android Automerger [Wed, 17 Oct 2012 23:07:40 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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:08:33 +0000 (21:08 +0200)]
Fix crash when viewing installed app details page
Change-Id: I6b4f644d5208c8ac0254bcc8348b87575c431c06
The Android Automerger [Wed, 17 Oct 2012 13:59:59 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 17 Oct 2012 05:00:45 +0000 (22:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:31:09 +0000 (17:31 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
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:44:58 +0000 (09:44 -0700)]
Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
Baligh Uddin [Tue, 16 Oct 2012 16:29:04 +0000 (09:29 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Automerger [Tue, 16 Oct 2012 14:00:00 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-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 20:10:51 +0000 (13:10 -0700)]
Align text in Language & input screen
Bug:
7336478
Change-Id: I38e916e851cbae3284970fe8d8764a6a6018b0ff
The Android Automerger [Mon, 15 Oct 2012 13:59:45 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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: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
The Android Automerger [Sat, 13 Oct 2012 10:50:23 +0000 (03:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
The Android Automerger [Fri, 12 Oct 2012 23:33:00 +0000 (16:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
Jim Miller [Fri, 12 Oct 2012 20:20:15 +0000 (13:20 -0700)]
Merge "Disable security widgets for now" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 18:50:19 +0000 (11:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Fri, 12 Oct 2012 16:14:10 +0000 (09:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 13:59:44 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to 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
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
The Android Automerger [Thu, 11 Oct 2012 23:27:00 +0000 (16:27 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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: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:27:06 +0000 (10:27 -0700)]
Merge "Fix accessibility gesture summary text." into jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 14:04:18 +0000 (07:04 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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:47:57 +0000 (21:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-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 [Wed, 10 Oct 2012 23:59:47 +0000 (16:59 -0700)]
Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev
Amith Yamasani [Wed, 10 Oct 2012 23:42:20 +0000 (16:42 -0700)]
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
Jeff Sharkey [Wed, 10 Oct 2012 23:27:26 +0000 (16:27 -0700)]
Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 23:20:46 +0000 (16:20 -0700)]
Switch to IPackageManager.getServiceInfo().
Bug:
7095093
Change-Id: I79b9f077c9d69c5629b7dd0071a11ccda50839cd
Dianne Hackborn [Wed, 10 Oct 2012 22:53:57 +0000 (15:53 -0700)]
Merge "Fix issue #
7318666: hide developer options from user build" into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 21:27:35 +0000 (14:27 -0700)]
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
Baligh Uddin [Wed, 10 Oct 2012 22:28:23 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61
Auto-generated-cl: translation import
Michael Jurka [Wed, 10 Oct 2012 21:56:53 +0000 (23:56 +0200)]
Disable security widgets for now
Change-Id: Ia4627d697514c4029fb0fb3250d674ed25495f97
Dianne Hackborn [Wed, 10 Oct 2012 22:05:42 +0000 (15:05 -0700)]
Fix issue #
7318666: hide developer options from user build
Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
Jeff Sharkey [Wed, 10 Oct 2012 21:29:08 +0000 (14:29 -0700)]
Merge "Use user-specific PackageManager." into jb-mr1-dev
Svetoslav Ganov [Wed, 10 Oct 2012 21:16:49 +0000 (14:16 -0700)]
Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 21:07:00 +0000 (14:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Svetoslav Ganov [Wed, 10 Oct 2012 20:50:36 +0000 (13:50 -0700)]
Accessibility enabled by gesture not reflected in settings screen.
1. We have added a global gesture to enable accessibility which is long press
on power followed by a long press with two fingers. If this gesture is
performed when the settings for an accessibility service are on the screen,
accessibility and the screen-reader are enabled while the UI does not reflect
that and the user may try to enable the already enabled screen-reader which
will show two irrelevant warning dialogs - one for enabling the screen-reader
and one for enabling explore by touch (assuming the screen-reader requests it).
This change adds a simple content observer for the relevant accessibility
settings which upon a change calls the functions to refresh the settings UI.
bug:
7309127
Change-Id: I214c64877086eeb1fe156bcc195aa4e2931d6bdb
Adam Powell [Wed, 10 Oct 2012 20:13:41 +0000 (13:13 -0700)]
Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
Jeff Sharkey [Wed, 10 Oct 2012 18:43:22 +0000 (11:43 -0700)]
Use user-specific PackageManager.
Bug:
7095093
Change-Id: Ia97065d4bdf5203372b76b62a6dfd72858892234
Adam Powell [Wed, 10 Oct 2012 18:31:34 +0000 (11:31 -0700)]
Fix padding for PagerTabStrip on large screen devices
Bug
7323241
Change-Id: I83cd4d4e1eea150817c519328bb2572b6043b3b7
Russell Brenner [Wed, 10 Oct 2012 17:31:58 +0000 (10:31 -0700)]
Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
Amith Yamasani [Wed, 10 Oct 2012 00:13:33 +0000 (17:13 -0700)]
Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:49 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Tue, 9 Oct 2012 23:57:25 +0000 (16:57 -0700)]
Go back to top of list when Settings is relaunched
Also fixes slight movements when coming back from Add account.
Bug:
7312513
Bug:
7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
Irfan Sheriff [Tue, 9 Oct 2012 23:32:25 +0000 (16:32 -0700)]
Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
Irfan Sheriff [Tue, 9 Oct 2012 23:03:38 +0000 (16:03 -0700)]
Have poor network avoidance turned off by default
Bug:
7318044
Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9
Russell Brenner [Tue, 9 Oct 2012 22:13:46 +0000 (15:13 -0700)]
Return RESULT_OK when wifi connection established
Two new exit points were not setting a return result. Since the
default result for an activity is RESULT_CANCEL, Setup Wizard was
continuing as if no connection was made.
Bug:
7298234
Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
alanv [Tue, 9 Oct 2012 18:05:45 +0000 (11:05 -0700)]
Fix accessibility gesture summary text.
Bug:
7309663
Change-Id: I669e26d0ffafe73f0fc9296c4ba91c7c08a89ae0
The Android Automerger [Tue, 9 Oct 2012 13:59:52 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Tue, 9 Oct 2012 04:56:00 +0000 (21:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 9 Oct 2012 02:29:33 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0bdf68adcdbafb85d848aacc2ceccc5f619fba3
Auto-generated-cl: translation import
Svetoslav Ganov [Mon, 8 Oct 2012 23:35:52 +0000 (16:35 -0700)]
Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev
Svetoslav Ganov [Mon, 8 Oct 2012 22:54:09 +0000 (15:54 -0700)]
Accessibility settings should update after gesture to enable accessibility.
1. We have added a global gesture to enable accessibility which is long press
on power follower by a long press with two fingers. If this gesture is
performed when accessibility settings are on the screen, accessibility and
the screen-reader are enabled while the UI does not reflect that and the
user may try to enable the already enabled screen-reader which will show
two irrelevant warning dialogs - one for enabling the screen-reader and
one for enabling explore by touch (assuming the screen-reader requests it).
This change adds a simple content observer for the relevant accessibility
settings which upon a change calls the functions to refresh the settings UI.
bug:
7309127
Change-Id: I45851d7789e24e9e0a5bc5aaac39db9a12b60e0c
Vikram Aggarwal [Mon, 8 Oct 2012 19:57:49 +0000 (12:57 -0700)]
Remove further logging
Bug:
7302014 CryptKeeper logs PII data
Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
Jake Hamby [Mon, 8 Oct 2012 19:13:14 +0000 (12:13 -0700)]
Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
Vikram Aggarwal [Mon, 8 Oct 2012 16:11:06 +0000 (09:11 -0700)]
Remove verbose logging
Bug:
7302014 CryptKeeper logs PII data
Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
Baligh Uddin [Mon, 8 Oct 2012 14:53:45 +0000 (07:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:05:35 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Sun, 7 Oct 2012 21:02:25 +0000 (14:02 -0700)]
Merge "Fix layout for decryption password entry." into jb-mr1-dev
Svetoslav Ganov [Sun, 7 Oct 2012 18:48:53 +0000 (11:48 -0700)]
Clean up 'accessibility shortcut' screen.
1. Last polishes to the accessibility shortcut screen.
bug:
7298927
Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
The Android Automerger [Sun, 7 Oct 2012 13:59:55 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Sat, 6 Oct 2012 04:13:53 +0000 (21:13 -0700)]
Fix layout for decryption password entry.
Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.
Also removed some vestigial keyboard view in the layout.
Bug:
7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830
Amith Yamasani [Sat, 6 Oct 2012 03:53:02 +0000 (20:53 -0700)]
Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev