OSDN Git Service
Jim Miller [Fri, 22 Aug 2014 22:25:15 +0000 (22:25 +0000)]
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
Elliott Hughes [Fri, 22 Aug 2014 20:42:37 +0000 (20:42 +0000)]
Merge "Settings psuedolocalization fixes." into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 19:37:09 +0000 (19:37 +0000)]
Merge "Switch user on clicking on a user in User Settings" into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 19:33:23 +0000 (12:33 -0700)]
Switch user on clicking on a user in User Settings
This slipped out of the code somehow.
Bug:
15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
Elliott Hughes [Fri, 22 Aug 2014 19:06:23 +0000 (12:06 -0700)]
Settings psuedolocalization fixes.
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.
Also remove some dead code now zz_ZY and zz_ZZ are gone.
Bug:
17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
Baligh Uddin [Fri, 22 Aug 2014 17:24:31 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Jessica Hummel [Fri, 22 Aug 2014 10:28:51 +0000 (11:28 +0100)]
Final tweaks to work profile strings
Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:
15744182
Alexandra Gherghina [Fri, 22 Aug 2014 12:53:28 +0000 (12:53 +0000)]
Merge "Update strings for removing work profile" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 12:53:18 +0000 (12:53 +0000)]
Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 10:17:29 +0000 (11:17 +0100)]
Update strings for removing work profile
Bug:
17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
Jim Miller [Fri, 22 Aug 2014 02:24:47 +0000 (19:24 -0700)]
Show trust agent entries as disabled rather than removing them.
Fixes bug
17108810
Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
Maurice Lam [Fri, 22 Aug 2014 01:22:24 +0000 (01:22 +0000)]
Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
Amith Yamasani [Thu, 21 Aug 2014 20:51:44 +0000 (20:51 +0000)]
Merge "Fix layout of Apn Settings screen" into lmp-dev
Amith Yamasani [Thu, 21 Aug 2014 20:30:35 +0000 (13:30 -0700)]
Fix layout of Apn Settings screen
Bug:
14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1
Kenny Guy [Thu, 21 Aug 2014 17:44:24 +0000 (17:44 +0000)]
Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
Diego Pontoriero [Thu, 21 Aug 2014 16:34:37 +0000 (16:34 +0000)]
Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
PauloftheWest [Thu, 21 Aug 2014 16:24:10 +0000 (16:24 +0000)]
Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 12:20:21 +0000 (13:20 +0100)]
Disable non-permitted accessibility services and IMEs
Bug:
14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
PauloftheWest [Wed, 20 Aug 2014 22:10:56 +0000 (15:10 -0700)]
Fixed a crash when sharing video through Bluetooth.
+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.
Bug:
17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b
vandwalle [Thu, 21 Aug 2014 14:55:45 +0000 (14:55 +0000)]
Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
Alexandra Gherghina [Thu, 21 Aug 2014 11:35:31 +0000 (12:35 +0100)]
Modify Spinner so that the arrow is closer to the text
Bug:
17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
Jessica Hummel [Thu, 21 Aug 2014 11:28:23 +0000 (11:28 +0000)]
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
Maurice Lam [Thu, 21 Aug 2014 03:34:07 +0000 (20:34 -0700)]
[WifiSetup] Tablet portrait layout
Bug:
17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
Tadashi G. Takaoka [Thu, 21 Aug 2014 02:41:57 +0000 (11:41 +0900)]
Remove "Choose Keyboards" settings
Bug:
17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
Diego Pontoriero [Tue, 12 Aug 2014 01:25:51 +0000 (18:25 -0700)]
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell
for determining carrier app instead of MCC/MNC.
Related WirelessSettings change: http://ag/374330
Related Aeroshell change to SetupWizard: http://ag/520857
Bug:
16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
vandwalle [Wed, 20 Aug 2014 21:10:27 +0000 (14:10 -0700)]
rename ScanResult.status -> autoJoinStatus
This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
Jeff Davidson [Thu, 21 Aug 2014 00:47:29 +0000 (00:47 +0000)]
Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
Jeff Davidson [Wed, 20 Aug 2014 23:59:30 +0000 (23:59 +0000)]
Merge "Less intrusive VPN dialog." into lmp-dev
PauloftheWest [Wed, 20 Aug 2014 21:56:55 +0000 (21:56 +0000)]
Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
PauloftheWest [Wed, 20 Aug 2014 21:46:37 +0000 (14:46 -0700)]
Added a default Bluetooth icon for Bluetooth Preferences.
Bug:
17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
Jessica Hummel [Wed, 20 Aug 2014 08:18:24 +0000 (09:18 +0100)]
Make string for work profile consistent with provisioning and framework strings.
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:
16468412
Jeff Brown [Wed, 20 Aug 2014 00:47:54 +0000 (17:47 -0700)]
Declare CAST_SETTINGS activity.
Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.
Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
Jon Miranda [Wed, 20 Aug 2014 15:24:32 +0000 (15:24 +0000)]
Merge "Added a developer option to save attribute data." into lmp-dev
Maurice Lam [Wed, 20 Aug 2014 01:59:43 +0000 (01:59 +0000)]
Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
Alan Viverette [Wed, 20 Aug 2014 00:37:16 +0000 (17:37 -0700)]
Add "experimental" subtitle to color correction and inversion
BUG:
17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
PauloftheWest [Wed, 20 Aug 2014 21:09:42 +0000 (21:09 +0000)]
Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
Amith Yamasani [Wed, 20 Aug 2014 20:58:45 +0000 (20:58 +0000)]
Merge "Update string for profile owner addition warning" into lmp-dev
Amith Yamasani [Wed, 20 Aug 2014 20:43:13 +0000 (13:43 -0700)]
Update string for profile owner addition warning
Bug:
16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
Maurice Lam [Tue, 19 Aug 2014 20:20:27 +0000 (13:20 -0700)]
[WifiSetup] Change illustration aspect ratio
Change the aspect ratio of the illustration to 20:9 to align with UX
mocks.
Bug:
17111669
Change-Id: I37b2ca7624b7baf156830db53d2cea97a78e2dab
PauloftheWest [Wed, 20 Aug 2014 20:03:17 +0000 (20:03 +0000)]
Merge "Fixed a Settings dialog crash." into lmp-dev
PauloftheWest [Wed, 20 Aug 2014 17:55:12 +0000 (10:55 -0700)]
Fixed a Settings dialog crash.
+ Fixed a bug where Settings would crash when trying to open paired bluetooth
device settings after device orientation change.
Bug:
16972564
Change-Id: I0e93551ae7d8f21711d85093756fc33b62f59b24
Baligh Uddin [Tue, 19 Aug 2014 01:59:06 +0000 (18:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01598edaa725d9a59747e892ba470ee1e876f8eb
Auto-generated-cl: translation import
Jeff Davidson [Tue, 19 Aug 2014 01:13:43 +0000 (18:13 -0700)]
Suppress WiFi Assistant card until future platform updates.
This replaces the previous behavior of an increasing timeout. When the
user dismisses the WiFi Assistant card, either by opting out or
successfully configuring the assistant, the card is suppressed until
the next major platform upgrade (assuming the assistant is not enabled
at the time of the upgrade).
Bug:
16902858
Change-Id: I5373a7a743f21777b7b75a620b5a4e9004e57466
Jon Miranda [Tue, 12 Aug 2014 16:08:29 +0000 (09:08 -0700)]
Added a developer option to save attribute data.
After the checkbox for 'Enable view attribute inspection' is checked,
newly constructed Views will save their attribute data.
Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849
PauloftheWest [Mon, 18 Aug 2014 21:44:48 +0000 (14:44 -0700)]
Fixed a Bluetooth Scanning issue.
+ When refreshing Bluetooth devices, sometimes it took awhile for some
devices to come back up. This is a fix.
Bug:
17049458
Change-Id: Id6233b38585e003e0432707663af4d06b0ce98c2
John Spurlock [Wed, 20 Aug 2014 19:42:48 +0000 (19:42 +0000)]
Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
John Spurlock [Wed, 20 Aug 2014 19:37:07 +0000 (15:37 -0400)]
Settings: Remove needless dialogTitle attribute.
DropDownPreference has no dialog, and therefore no title.
Remove to avoid confusion for future copy-pasters.
Bug:
16241745
Change-Id: I1130ed5d90b9b769294b64f02ddbf8f00fabe6b0
Alexandra Gherghina [Mon, 18 Aug 2014 16:50:04 +0000 (16:50 +0000)]
Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
Alexandra Gherghina [Mon, 18 Aug 2014 12:16:17 +0000 (13:16 +0100)]
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.
Bug:
17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
Alexandra Gherghina [Mon, 18 Aug 2014 13:34:08 +0000 (14:34 +0100)]
Fix Account Settings crash
Bug:
17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
Baligh Uddin [Sun, 17 Aug 2014 13:49:40 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 16 Aug 2014 07:01:16 +0000 (00:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
Adam Lesinski [Sat, 16 Aug 2014 06:43:23 +0000 (06:43 +0000)]
Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
Adam Lesinski [Tue, 12 Aug 2014 03:54:12 +0000 (20:54 -0700)]
Added Warning dialog when enabling usage access for app
The user is now thoroughly warned about enabling third party
app access to device history.
Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
Baligh Uddin [Sat, 16 Aug 2014 04:02:06 +0000 (04:02 +0000)]
am
2719eebf: (-s ours) am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE
Paul Lawrence [Tue, 19 Aug 2014 20:50:14 +0000 (20:50 +0000)]
Merge "Fix encryption strings" into lmp-dev
Paul Lawrence [Tue, 19 Aug 2014 20:49:52 +0000 (20:49 +0000)]
Merge "Change decryption strings" into lmp-dev
Lorenzo Colitti [Tue, 12 Aug 2014 01:05:51 +0000 (10:05 +0900)]
Stop using LinkProperties for static configuration.
Bug:
16114392
Bug:
16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
Paul Lawrence [Tue, 19 Aug 2014 15:55:26 +0000 (08:55 -0700)]
Change decryption strings
Bug:
17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
Lifu Tang [Tue, 19 Aug 2014 04:24:09 +0000 (04:24 +0000)]
Merge "Set switch to the correct enabling state" into lmp-dev
Lifu Tang [Mon, 18 Aug 2014 23:46:48 +0000 (16:46 -0700)]
Set switch to the correct enabling state
- Fix b/
16951708
Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
PauloftheWest [Mon, 18 Aug 2014 20:00:36 +0000 (20:00 +0000)]
Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
PauloftheWest [Mon, 18 Aug 2014 16:25:03 +0000 (09:25 -0700)]
Fixed a crash when rotating a saved networks dialog.
Bug:
16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
PauloftheWest [Mon, 18 Aug 2014 20:00:11 +0000 (20:00 +0000)]
Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
PauloftheWest [Mon, 18 Aug 2014 18:49:09 +0000 (11:49 -0700)]
Fixed a bug were AdvanceWifiSettings would crash on resume.
Bug:
17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
Julia Reynolds [Tue, 19 Aug 2014 18:43:31 +0000 (18:43 +0000)]
Merge "Supress menu if screen ought to be hidden." into lmp-dev
Lifu Tang [Tue, 19 Aug 2014 17:25:19 +0000 (17:25 +0000)]
Merge "Dim the preference icons when its disabled" into lmp-dev
Julia Reynolds [Mon, 18 Aug 2014 20:04:48 +0000 (16:04 -0400)]
Supress menu if screen ought to be hidden.
Bug:
14081992
Change-Id: I56183413a001b3e6dd74de249e9afc131e6671e4
Lifu Tang [Mon, 18 Aug 2014 18:08:43 +0000 (11:08 -0700)]
Dim the preference icons when its disabled
- Fix b/
16956979
Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
Amith Yamasani [Tue, 19 Aug 2014 15:39:37 +0000 (15:39 +0000)]
Merge "Update strings for guest removal affordance and dialog" into lmp-dev
Amith Yamasani [Mon, 18 Aug 2014 23:42:43 +0000 (16:42 -0700)]
Update strings for guest removal affordance and dialog
Exit guest -> Remove guest
etc.
Bug:
16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
Christopher Tate [Fri, 15 Aug 2014 16:20:46 +0000 (09:20 -0700)]
Disallow downgrade of bundled home apps
Bug
14162565
Change-Id: I754721178722edbf0765039bc9669ed24b92633c
Baligh Uddin [Fri, 15 Aug 2014 22:36:02 +0000 (22:36 +0000)]
am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
Jeff Davidson [Tue, 12 Aug 2014 22:59:01 +0000 (15:59 -0700)]
Less intrusive VPN dialog.
Add new AppOps to Settings and remove references to obsolete
ManageDialog. VPN UX now lives in Quick Settings.
Bug:
12878887
Bug:
16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
Jim Miller [Fri, 15 Aug 2014 21:36:38 +0000 (21:36 +0000)]
Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
Jim Miller [Fri, 15 Aug 2014 21:28:58 +0000 (14:28 -0700)]
Remove temporary workaround for GMS TrustAgent while API changed.
Fixes bug
16401527
Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
Fabrice Di Meglio [Fri, 15 Aug 2014 21:14:17 +0000 (14:14 -0700)]
Update NFC to use a SwitchPreference
- do the switch
See bug: #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
arete [Fri, 15 Aug 2014 19:04:48 +0000 (12:04 -0700)]
Keep SwitchPreference status until user makes choice in confirmation dialog.
Bug:
17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
Fabrice Di Meglio [Wed, 6 Aug 2014 17:22:52 +0000 (10:22 -0700)]
Update Airplane mode to use a SwitchPreference
- do the switch
See bug: #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
Glenn Kasten [Fri, 15 Aug 2014 21:01:17 +0000 (21:01 +0000)]
Merge "Increase character limit for translation" into lmp-dev
Glenn Kasten [Fri, 15 Aug 2014 20:24:45 +0000 (13:24 -0700)]
Increase character limit for translation
Bug:
17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
Maurice Lam [Fri, 15 Aug 2014 20:29:32 +0000 (20:29 +0000)]
Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
Maurice Lam [Fri, 15 Aug 2014 19:04:12 +0000 (12:04 -0700)]
[WifiSetup] Use framework AutoMirrored
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.
Bug:
17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
Julia Reynolds [Fri, 15 Aug 2014 20:17:27 +0000 (20:17 +0000)]
Merge "Disable disable button according to user restrictions." into lmp-dev
John Spurlock [Thu, 14 Aug 2014 17:03:13 +0000 (13:03 -0400)]
Settings: Update to follow NotificationManager aidl change.
Depends on frameworks/base:
I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
Baligh Uddin [Fri, 15 Aug 2014 05:48:03 +0000 (05:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Fabrice Di Meglio [Fri, 15 Aug 2014 18:37:33 +0000 (18:37 +0000)]
Merge "Fix bug #
16703191 APN settings shows back button even when you intent into it" into lmp-dev
Fabrice Di Meglio [Wed, 13 Aug 2014 23:22:38 +0000 (16:22 -0700)]
Fix bug #
16703191 APN settings shows back button even when you intent into it
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment
Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
Fabrice Di Meglio [Wed, 13 Aug 2014 17:45:19 +0000 (10:45 -0700)]
Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings.
SettingsPreferenceFragment$1@
273c8fdb was not registered
- add override for onUnbindPreferences() that will unregister the observer
if needed
- keep track of the root adapter so that we can unregister / register with
the correct one (by having a new PreferenceScreen the root adapter would not
be the same and thus unregistering the Observer on the new one would not work
and create the current bug)
Change-Id: I2cef0398c2ae0ab4f5ffd67ca20e8874be997bf6
Julia Reynolds [Fri, 8 Aug 2014 16:22:42 +0000 (12:22 -0400)]
Disable disable button according to user restrictions.
Bug:
16891777
Change-Id: I5223af905dc43d259c5fd3e03eedf8c71bf23ae9
Maurice Lam [Fri, 15 Aug 2014 02:46:37 +0000 (02:46 +0000)]
Merge "[WifiSetup] Update illustrations" into lmp-dev
Maurice Lam [Wed, 13 Aug 2014 22:52:15 +0000 (15:52 -0700)]
[WifiSetup] Update illustrations
Update illustration assets and support for auto-mirroring for RTL
languages.
Bug:
16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
Jim Miller [Fri, 15 Aug 2014 01:01:50 +0000 (01:01 +0000)]
Merge "API review - move confirm credential constants from Intent" into lmp-dev
Selim Gurun [Thu, 14 Aug 2014 22:19:15 +0000 (15:19 -0700)]
Remove logic to read the key from GServices
Bug:
12492817
The key is now stored in webview apk so remove the logic
to read from GServices.
Change-Id: I9f9b57d59885d93023be307a80d5a7db143ffbfe
arete [Thu, 14 Aug 2014 20:45:36 +0000 (13:45 -0700)]
Cannot cancel in the "Warn app installation" dialog in security settings.
Bug:
16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
Jim Miller [Wed, 13 Aug 2014 21:52:52 +0000 (14:52 -0700)]
API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.
Fixes bug
17006280
Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
Paul Lawrence [Wed, 13 Aug 2014 23:00:00 +0000 (16:00 -0700)]
Fix encryption strings
Bug:
16901855
Change-Id: I7297a88c173d5a5ca03ee404938c9d4bad550110
Amith Yamasani [Wed, 13 Aug 2014 20:10:14 +0000 (20:10 +0000)]
Merge "Allow creating last user even if a guest exists." into lmp-dev
Paul Lawrence [Wed, 13 Aug 2014 19:47:52 +0000 (19:47 +0000)]
Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev