OSDN Git Service
The Android Open Source Project [Tue, 22 May 2012 20:06:55 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: Iceaefeeee355a1ceb5c38751649e375f5c52bd7c
Andrew Flynn [Tue, 22 May 2012 18:41:21 +0000 (11:41 -0700)]
am
be4a0325: Merge "Update WPS Dialog" into jb-dev
* commit '
be4a032581ae6dfb41662486085e64052d085314':
Update WPS Dialog
Andrew Flynn [Tue, 22 May 2012 18:39:30 +0000 (11:39 -0700)]
Merge "Update WPS Dialog" into jb-dev
Andrew Flynn [Tue, 22 May 2012 17:54:54 +0000 (10:54 -0700)]
Update WPS Dialog
- Remove title
- Change description text
- Add WPS icon
Bug:
6457246
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
Andrew Flynn [Tue, 22 May 2012 18:05:54 +0000 (11:05 -0700)]
am
115ae0cf: Change wifi-on-but-no-networks string
* commit '
115ae0cf0119c07fa8e255df6acf8077282854c6':
Change wifi-on-but-no-networks string
Andrew Flynn [Tue, 22 May 2012 16:44:51 +0000 (09:44 -0700)]
Change wifi-on-but-no-networks string
Bug:
6533206
Change-Id: I4f5c1d77ffe1bf93c33c9b65f9fdc7278864f88f
Jean-Baptiste Queru [Tue, 22 May 2012 15:52:27 +0000 (08:52 -0700)]
am
1a47dff3: Merge "Remove title bar background drawable from running app detail view"
* commit '
1a47dff3ceeb45a97d08f58f19bfcf7becf145d4':
Remove title bar background drawable from running app detail view
Jean-Baptiste Queru [Tue, 22 May 2012 14:48:40 +0000 (07:48 -0700)]
Merge "Remove title bar background drawable from running app detail view"
The Android Automerger [Tue, 22 May 2012 14:07:04 +0000 (07:07 -0700)]
merge in jb-release history after reset to jb-dev
alanv [Tue, 22 May 2012 01:29:40 +0000 (18:29 -0700)]
am
0aa7c4f1: Fixed all Accessibility lint warnings in Settings app.
* commit '
0aa7c4f14169c95d203ed996ff6eed3981818c6c':
Fixed all Accessibility lint warnings in Settings app.
alanv [Tue, 22 May 2012 00:55:19 +0000 (17:55 -0700)]
Fixed all Accessibility lint warnings in Settings app.
Change-Id: Ida98444f8942d3618d84c0a6f78cc3653ea4ad24
Adam Powell [Mon, 21 May 2012 23:04:06 +0000 (16:04 -0700)]
am
0901a3c2: Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
* commit '
0901a3c2132cb439fbab64d13cbe9ede0e5e5379':
Update the All Apps PagerTabStrip text appearance.
Adam Powell [Mon, 21 May 2012 23:02:04 +0000 (16:02 -0700)]
Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
Adam Powell [Mon, 21 May 2012 21:18:49 +0000 (14:18 -0700)]
Update the All Apps PagerTabStrip text appearance.
Change-Id: I5f6b924d0a291b0723b76ee024bc87cb69d61893
Svetoslav Ganov [Mon, 21 May 2012 21:12:43 +0000 (14:12 -0700)]
am
8d43aeae: Merge "Updating the checkbox state to match the title." into jb-dev
* commit '
8d43aeae0347435a03e4007eef5fce578ec50184':
Updating the checkbox state to match the title.
Svetoslav Ganov [Mon, 21 May 2012 21:09:27 +0000 (14:09 -0700)]
Merge "Updating the checkbox state to match the title." into jb-dev
Jean-Baptiste Queru [Mon, 21 May 2012 19:36:49 +0000 (12:36 -0700)]
am
c0653a12: Merge "Expandable NumberPicker width in bytesPicker dialog"
* commit '
c0653a12304d64aa6107b2f06bb6d0e2e73a2c33':
Expandable NumberPicker width in bytesPicker dialog
Jean-Baptiste Queru [Mon, 21 May 2012 18:37:30 +0000 (11:37 -0700)]
Merge "Expandable NumberPicker width in bytesPicker dialog"
The Android Automerger [Mon, 21 May 2012 14:06:07 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Mon, 21 May 2012 04:53:26 +0000 (21:53 -0700)]
am
766b2861: Add UI to select multiple keyboard layouts.
* commit '
766b286187d02b3da6e0142376a4478072f30a16':
Add UI to select multiple keyboard layouts.
Jeff Brown [Fri, 18 May 2012 22:04:45 +0000 (15:04 -0700)]
Add UI to select multiple keyboard layouts.
Bug:
6405203
Change-Id: I27ca4630aebcb39b83298d37d8fb3f4ef0080317
The Android Automerger [Sun, 20 May 2012 14:39:53 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Sat, 19 May 2012 01:44:06 +0000 (18:44 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ibc7ab1d501b3fd26d83a26a8daec7a01eb6f9030
Svetoslav Ganov [Sat, 19 May 2012 01:00:24 +0000 (18:00 -0700)]
Updating the checkbox state to match the title.
1. Now the the setting is names lock screen rotation
which is the opposite as it was before so this
patch reverses the checkbox state.
bug:
6507335
Change-Id: Ic0aab21fa70871f64e37ac05f7917d69f9c0a0df
Svetoslav Ganov [Fri, 18 May 2012 22:59:23 +0000 (15:59 -0700)]
am
fc16237d: Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
* commit '
fc16237d5debc7375be1d485e510df2156d8da0f':
Removed Accessibility tutorial and orphaned resources.
Irfan Sheriff [Fri, 18 May 2012 22:59:22 +0000 (15:59 -0700)]
am
ee7589c0: Merge "Fix p2p settings crash" into jb-dev
* commit '
ee7589c02ab2cf4a4169531df54595f81f0d88a0':
Fix p2p settings crash
Svetoslav Ganov [Fri, 18 May 2012 22:21:23 +0000 (15:21 -0700)]
Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
Irfan Sheriff [Fri, 18 May 2012 22:10:41 +0000 (15:10 -0700)]
Merge "Fix p2p settings crash" into jb-dev
Jeff Sharkey [Fri, 18 May 2012 21:00:10 +0000 (14:00 -0700)]
Avoid NPE until we understand better.
Bug:
6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
Michael Kolb [Fri, 18 May 2012 17:54:31 +0000 (10:54 -0700)]
Add seperate activity for setup wizard wifi picker to adjust theme
Bug:
6517721
Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
Dianne Hackborn [Fri, 18 May 2012 01:05:17 +0000 (18:05 -0700)]
Fix issues
6512411 and
6512951 in ManageApplications.
6512411 java.lang.IndexOutOfBoundsException: Invalid index 0, size is 0
6512951 Settings crash while returning from App info screen
Also fix padding around the UI, and display of storage use.
Change-Id: Ibfcfe1a4a80f25f81ba2cabbb2e3d60aaa9ac04e
alanv [Fri, 18 May 2012 21:28:53 +0000 (14:28 -0700)]
Removed Accessibility tutorial and orphaned resources.
Change-Id: Ic96e002b04bed4c525fe959a3ad7e55d8709c75f
Jeff Sharkey [Fri, 18 May 2012 21:21:40 +0000 (14:21 -0700)]
am
409433e9: Merge "Avoid NPE until we understand better." into jb-dev
* commit '
409433e904f9b8a65a87274b7d5f582f0ac46e26':
Avoid NPE until we understand better.
Svetoslav Ganov [Fri, 18 May 2012 21:21:39 +0000 (14:21 -0700)]
am
6a09c07b: Merge "Removing explore by touch from settings." into jb-dev
* commit '
6a09c07b20e2a99a86882ecb8c30ee35f6c6f4ca':
Removing explore by touch from settings.
Michael Kolb [Fri, 18 May 2012 21:21:38 +0000 (14:21 -0700)]
am
5dfc5053: Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
* commit '
5dfc505301f70de24adf0724fb270ab3d5b5cd9b':
Add seperate activity for setup wizard wifi picker to adjust theme
Jeff Sharkey [Fri, 18 May 2012 21:05:25 +0000 (14:05 -0700)]
Merge "Avoid NPE until we understand better." into jb-dev
Jeff Sharkey [Fri, 18 May 2012 21:00:10 +0000 (14:00 -0700)]
Avoid NPE until we understand better.
Bug:
6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
Svetoslav Ganov [Fri, 18 May 2012 20:50:37 +0000 (13:50 -0700)]
Merge "Removing explore by touch from settings." into jb-dev
Irfan Sheriff [Fri, 18 May 2012 20:27:05 +0000 (13:27 -0700)]
Fix p2p settings crash
- Restore on orientation change
- Use appropriate string for dialog
Bug:
6456079
Bug:
6463563
Change-Id: I1fa0b90a14d09608b580ebf3d66b92fc8721eae7
Michael Kolb [Fri, 18 May 2012 20:23:43 +0000 (13:23 -0700)]
Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
Svetoslav Ganov [Wed, 16 May 2012 05:33:51 +0000 (22:33 -0700)]
Removing explore by touch from settings.
1. Now accessibility services request this mode and
we show a dialog so the user can give a consent.
Accessibility servces can toggle this mode at
runtime from their settings, for example.
bug:
5932640
Change-Id: Id4d3e9c83c488f97b7e53d4baadf7de886958a4d
Michael Kolb [Fri, 18 May 2012 17:54:31 +0000 (10:54 -0700)]
Add seperate activity for setup wizard wifi picker to adjust theme
Bug:
6517721
Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
The Android Automerger [Fri, 18 May 2012 17:49:58 +0000 (10:49 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Dianne Hackborn [Fri, 18 May 2012 01:17:50 +0000 (18:17 -0700)]
am
7d2658ff: Merge "Fix issues
6512411 and
6512951 in ManageApplications." into jb-dev
* commit '
7d2658ffbf1b6bfcf51a28de5ea98293245f7ebe':
Fix issues
6512411 and
6512951 in ManageApplications.
Dianne Hackborn [Fri, 18 May 2012 01:15:44 +0000 (18:15 -0700)]
Merge "Fix issues
6512411 and
6512951 in ManageApplications." into jb-dev
Dianne Hackborn [Fri, 18 May 2012 01:05:17 +0000 (18:05 -0700)]
Fix issues
6512411 and
6512951 in ManageApplications.
6512411 java.lang.IndexOutOfBoundsException: Invalid index 0, size is 0
6512951 Settings crash while returning from App info screen
Also fix padding around the UI, and display of storage use.
Change-Id: Ibfcfe1a4a80f25f81ba2cabbb2e3d60aaa9ac04e
Jeff Brown [Fri, 18 May 2012 00:17:13 +0000 (17:17 -0700)]
am
796e0a09: Merge "Add support for grouping keyboard layouts by collection." into jb-dev
* commit '
796e0a0960ae59d8406f62138f6259f4170e5b90':
Add support for grouping keyboard layouts by collection.
Jeff Brown [Thu, 17 May 2012 23:33:46 +0000 (16:33 -0700)]
Merge "Add support for grouping keyboard layouts by collection." into jb-dev
Jeff Brown [Thu, 17 May 2012 23:02:38 +0000 (16:02 -0700)]
Add support for grouping keyboard layouts by collection.
Bug:
6405203
Change-Id: I458c4976562ecea2fa03d96258ff28ebbdc95294
Russell Brenner [Mon, 14 May 2012 15:21:42 +0000 (08:21 -0700)]
Wifi select screen redlines
Bug:
6458336
Use proportional layout when wifi settings is used
by setup wizard
Change-Id: I91f50df29b23b1bece9cbd65a1426f8bc8d7c7f7
Russell Brenner [Thu, 17 May 2012 19:51:32 +0000 (12:51 -0700)]
am
1c0a8f95: Merge "Wifi select screen redlines" into jb-dev
* commit '
1c0a8f953ba85bd21660a44dbbf891f313367196':
Wifi select screen redlines
Russell Brenner [Thu, 17 May 2012 19:49:15 +0000 (12:49 -0700)]
Merge "Wifi select screen redlines" into jb-dev
Daniel Sandler [Thu, 17 May 2012 17:27:24 +0000 (10:27 -0700)]
am
70b59998: Refinements to notification controls in Settings.
* commit '
70b599983967b68894a9c41df2279424f6ab3fef':
Refinements to notification controls in Settings.
Daniel Sandler [Tue, 15 May 2012 19:48:09 +0000 (15:48 -0400)]
Refinements to notification controls in Settings.
- the switch is now a checkbox
- a dialog is posted to explain the ramifications of
disabling notifications
- the user may no longer disable notifications from system
apps (signed with the system cert); this is roughly the
same as the constraint on disabling packages (with the
exception that launchers may not be disabled entirely, but
their notifications may still be disabled).
Bug:
6493120 (checkbox)
Bug:
6448988 (confirmation dialog & protect system apps)
Change-Id: I6c7a47ba2eb943936d7f59cfc807a4390acc980d
The Android Automerger [Thu, 17 May 2012 14:05:25 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Gilles Debunne [Thu, 17 May 2012 04:50:49 +0000 (21:50 -0700)]
am
8cbfe403: Merge "Show dots when entering PIN password in landscape" into jb-dev
* commit '
8cbfe4036eeaf463c2a2ea7f5842cdd70b395228':
Show dots when entering PIN password in landscape
Gilles Debunne [Thu, 17 May 2012 04:48:58 +0000 (21:48 -0700)]
Merge "Show dots when entering PIN password in landscape" into jb-dev
Dianne Hackborn [Thu, 17 May 2012 02:46:46 +0000 (19:46 -0700)]
am
a8e3ab89: Merge "Rework manage applications to be page-able." into jb-dev
* commit '
a8e3ab89d625f620047c96d9fb066b42bf47c256':
Rework manage applications to be page-able.
Dianne Hackborn [Thu, 17 May 2012 02:41:45 +0000 (19:41 -0700)]
Merge "Rework manage applications to be page-able." into jb-dev
Dianne Hackborn [Wed, 16 May 2012 22:50:48 +0000 (15:50 -0700)]
Rework manage applications to be page-able.
Turn everything around so that we can have multiple list views
with their own adapters. Switch to using a ViewPager for managing
the different lists. Smile!
Change-Id: I9c102abb06cf67f313a8696507aa4597b38c7ab9
Eric Fischer [Wed, 16 May 2012 21:39:48 +0000 (14:39 -0700)]
am
25095a3e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
25095a3e3a8a7f15d4a598d9a556467eba5329bc':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 16 May 2012 21:36:39 +0000 (14:36 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Irfan Sheriff [Wed, 16 May 2012 21:22:54 +0000 (14:22 -0700)]
am
9822fdf9: Merge "Use icons in wifi settings" into jb-dev
* commit '
9822fdf988d5647b5c8aebb006326e7f48702420':
Use icons in wifi settings
Irfan Sheriff [Wed, 16 May 2012 21:18:43 +0000 (14:18 -0700)]
Merge "Use icons in wifi settings" into jb-dev
Amith Yamasani [Wed, 16 May 2012 21:16:55 +0000 (14:16 -0700)]
am
5d263ea4: No more silent-mode tristate in Sound Settings.
* commit '
5d263ea4896f87d736b21fb567d25cb44c212d3e':
No more silent-mode tristate in Sound Settings.
Irfan Sheriff [Wed, 16 May 2012 21:12:35 +0000 (14:12 -0700)]
Use icons in wifi settings
Bug:
6469022
Change-Id: I1bbd7681f3800db9387eb998da78cf0a42109600
Amith Yamasani [Wed, 16 May 2012 20:55:44 +0000 (13:55 -0700)]
No more silent-mode tristate in Sound Settings.
Delete delete delete.
Bug:
6036529
Change-Id: Ia1ec2a1740c3010ec4373bed18ce72bedcb9211b
Eric Fischer [Wed, 16 May 2012 20:52:56 +0000 (13:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb25ae1bd4c3964353afc8d275b304f775704753
Russell Brenner [Mon, 14 May 2012 15:21:42 +0000 (08:21 -0700)]
Wifi select screen redlines
Bug:
6458336
Use proportional layout when wifi settings is used
by setup wizard
Change-Id: I91f50df29b23b1bece9cbd65a1426f8bc8d7c7f7
Daisuke Miyakawa [Wed, 16 May 2012 17:14:11 +0000 (10:14 -0700)]
am
1cbacf10: Merge "Hide "Call ringtone & vibrate" when with no phone capability" into jb-dev
* commit '
1cbacf10bd525c8f467b37abc57085b071abd6de':
Hide "Call ringtone & vibrate" when with no phone capability
Daisuke Miyakawa [Wed, 16 May 2012 17:11:38 +0000 (10:11 -0700)]
Merge "Hide "Call ringtone & vibrate" when with no phone capability" into jb-dev
Gilles Debunne [Wed, 16 May 2012 14:46:12 +0000 (16:46 +0200)]
Show dots when entering PIN password in landscape
Bug
6184359
The EditText was customized with a PasswordTransformationMethod,
which is not propagated to the ExtractedEditText.
Using the equivalent inputType instead.
Change-Id: I174bd73b2aab4786767c1046996ad3541216d87e
Daisuke Miyakawa [Wed, 16 May 2012 15:41:38 +0000 (08:41 -0700)]
Hide "Call ringtone & vibrate" when with no phone capability
Bug:
6502724
Change-Id: I61bb82bd6a974fb5242191c500f3f30c11d93655
The Android Open Source Project [Wed, 16 May 2012 15:41:06 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id053dd82525fdf0244797e5c641aca8d122d8b4b
The Android Automerger [Wed, 16 May 2012 14:46:35 +0000 (07:46 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 14:05:26 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Russell Brenner [Wed, 16 May 2012 03:34:12 +0000 (20:34 -0700)]
am
e99006f7: Merge "Add wps icon to wifi panel" into jb-dev
* commit '
e99006f75b2639dbe910a318516f13b13af47480':
Add wps icon to wifi panel
Eric Fischer [Wed, 16 May 2012 03:29:58 +0000 (20:29 -0700)]
am
f6c5c743: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
f6c5c743a2164223db88e5c29c851d80fea16613':
Import translations. DO NOT MERGE
Russell Brenner [Wed, 16 May 2012 03:28:38 +0000 (20:28 -0700)]
Merge "Add wps icon to wifi panel" into jb-dev
Eric Fischer [Wed, 16 May 2012 01:29:29 +0000 (18:29 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Wed, 16 May 2012 01:28:12 +0000 (18:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97a3edb9a21d768a31e239ff882d802c00b137ec
Dianne Hackborn [Wed, 16 May 2012 00:42:19 +0000 (17:42 -0700)]
am
efb717bc: Merge "Okay F* you, CHAR LIMIT." into jb-dev
* commit '
efb717bc2dcbaa00ed2d9bde5b9f9463d54262c6':
Okay F* you, CHAR LIMIT.
Dianne Hackborn [Wed, 16 May 2012 00:36:55 +0000 (17:36 -0700)]
Merge "Okay F* you, CHAR LIMIT." into jb-dev
Amith Yamasani [Wed, 16 May 2012 00:08:00 +0000 (17:08 -0700)]
am
b9441710: Rename and flip meaning of auto-rotate to rotation lock.
* commit '
b94417109279fb7d27f0b27c97e76860ed6446ba':
Rename and flip meaning of auto-rotate to rotation lock.
Dianne Hackborn [Tue, 15 May 2012 23:59:41 +0000 (16:59 -0700)]
Okay F* you, CHAR LIMIT.
Change-Id: Id3e149c7a19622b64b80c9f159a8d9a45ba1ef25
Russell Brenner [Tue, 15 May 2012 22:27:51 +0000 (15:27 -0700)]
Add wps icon to wifi panel
Bug:
6449333
Change-Id: Iba74e895105253594bcfe8f0d98353714a816065
Amith Yamasani [Tue, 15 May 2012 23:15:40 +0000 (16:15 -0700)]
Rename and flip meaning of auto-rotate to rotation lock.
Bug:
6485348
Change-Id: I17359db3156641a69f6841d4e0c48708b5fafe4e
Jeff Sharkey [Tue, 15 May 2012 18:33:59 +0000 (11:33 -0700)]
Clear references after Data Usage View removed.
Bug:
6450986
Change-Id: Ia28479983fc192cbeefb16b8ce03f67241e4002c
Jeff Sharkey [Tue, 15 May 2012 20:36:11 +0000 (13:36 -0700)]
am
9ca54ef6: Merge "Fix layout bounds spelling." into jb-dev
* commit '
9ca54ef68897b96111514981e1a4dc7a603da00d':
Fix layout bounds spelling.
Jeff Sharkey [Tue, 15 May 2012 20:31:36 +0000 (13:31 -0700)]
Merge "Fix layout bounds spelling." into jb-dev
Jeff Sharkey [Tue, 15 May 2012 20:24:46 +0000 (13:24 -0700)]
Fix layout bounds spelling.
Change-Id: I6c09f9a332d83aeb92ac2afe1aa120bf544b596e
Jeff Sharkey [Tue, 15 May 2012 19:45:27 +0000 (12:45 -0700)]
am
44459c0a: Merge "Clear references after Data Usage View removed." into jb-dev
* commit '
44459c0a7619286dc0d9c95dc20205971b6f419b':
Clear references after Data Usage View removed.
Jeff Sharkey [Tue, 15 May 2012 19:43:45 +0000 (12:43 -0700)]
Merge "Clear references after Data Usage View removed." into jb-dev
Jeff Sharkey [Tue, 15 May 2012 18:41:54 +0000 (11:41 -0700)]
am
cda0663e: Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
* commit '
cda0663eb9c3a324c543c504647c7661f2ac7b35':
Enforce READ_EXTERNAL in Developer Options.
Irfan Sheriff [Tue, 15 May 2012 18:41:54 +0000 (11:41 -0700)]
am
53fa78fc: Merge "Push wifi direct to overflow menu" into jb-dev
* commit '
53fa78fcb237e52733d00a93a29485c4b3d7d290':
Push wifi direct to overflow menu
Jeff Sharkey [Tue, 15 May 2012 18:39:17 +0000 (11:39 -0700)]
Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
Irfan Sheriff [Tue, 15 May 2012 18:39:02 +0000 (11:39 -0700)]
Merge "Push wifi direct to overflow menu" into jb-dev
Jeff Sharkey [Tue, 15 May 2012 18:33:59 +0000 (11:33 -0700)]
Clear references after Data Usage View removed.
Bug:
6450986
Change-Id: Ia28479983fc192cbeefb16b8ce03f67241e4002c
Irfan Sheriff [Tue, 15 May 2012 18:29:51 +0000 (11:29 -0700)]
Push wifi direct to overflow menu
Bug:
6469022
Change-Id: I62e4b4372416a5fbaf43a52be71f7291b761997b
Jim Miller [Tue, 15 May 2012 18:31:52 +0000 (11:31 -0700)]
am
6da25703: Merge "Fix
6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev
* commit '
6da25703db587c5414df734baf9ac7e5cb504b70':
Fix
6110711: Fix buttons on ChooseLockPattern for landscape layout