OSDN Git Service
Adrian Roos [Tue, 2 Jun 2015 20:50:34 +0000 (20:50 +0000)]
Merge "Only show emergency app preference if enabled" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 18:05:55 +0000 (14:05 -0400)]
Change DeviceProfilesSettings to DialogFragment
This makes the lifecycle simpler to fix a crash after rotation.
Also do some adjusting of alignment while here.
Bug:
21444336
Bug:
21205689
Change-Id: I67eccf4833f53b5e5088ae5e6038d041e8653565
Jason Monk [Tue, 2 Jun 2015 20:09:16 +0000 (20:09 +0000)]
Merge "Fix battery usage screen issues" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 17:03:24 +0000 (13:03 -0400)]
Fix battery usage screen issues
Tint icons properly
Bug:
21077770
Show better icons for wifi and bt (remove the old ones)
Bug:
21172936
Also add a way to show fake items in power list for testing.
Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2
Sanket Padawe [Tue, 2 Jun 2015 18:14:30 +0000 (18:14 +0000)]
Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
Sanket Padawe [Tue, 2 Jun 2015 18:13:01 +0000 (11:13 -0700)]
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
Bug:
18048121
Change-Id: If837a58a4840be3d5b9f3cc16ecb261d9ab4420a
Xiyuan Xia [Tue, 2 Jun 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 15:37:19 +0000 (15:37 +0000)]
Merge "Clear connected legacy VPN during rescan" into mnc-dev
Hemant Gupta [Thu, 17 Apr 2014 14:40:28 +0000 (20:10 +0530)]
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
This patch acquires a wakelock to turn on the LCD display if the screen
is off during an access request for MAP. Without this patch it was
observed that if the screen was off, the LCD remained off for incoming
connection access request from remote devices and the user only heard
the notification sound without the LDC being lit up.
Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
Andre Eisenbach [Tue, 2 Jun 2015 09:00:29 +0000 (09:00 +0000)]
Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
Andre Eisenbach [Tue, 2 Jun 2015 08:48:29 +0000 (01:48 -0700)]
Bluetooth PAN: Set isPreferred to true (2/2)
isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.
Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.
Change-Id: I3d52d89136269508ac6416b695b22842f4bb557a
Robin Lee [Tue, 2 Jun 2015 01:45:40 +0000 (18:45 -0700)]
Clear connected legacy VPN during rescan
Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
Andres Morales [Tue, 2 Jun 2015 01:09:31 +0000 (01:09 +0000)]
Merge "[MasterClear] fix race in showing dialog" into mnc-dev
Andres Morales [Mon, 1 Jun 2015 23:23:41 +0000 (16:23 -0700)]
[MasterClear] fix race in showing dialog
Wiping the PDB effectively starves all other threads from
accessing flash, and freezes the UI. We throw up a dialog
but there's a race between drawing the dialog and starting the
wipe.
Show the dialog in onPreExecute to fix this.
Bug:
20854355
Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
Sanket Padawe [Mon, 1 Jun 2015 22:21:51 +0000 (22:21 +0000)]
Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 22:18:48 +0000 (15:18 -0700)]
Fix scrolling issue for Wifi hotspot setup layout.
Bug:
19856113
Change-Id: Id49ac7c452f10e0de43b18ecdecc68619faecbc3
Xiyuan Xia [Mon, 1 Jun 2015 22:05:54 +0000 (15:05 -0700)]
Add announceForAccessibility to ConfirmLockPattern
This makes Talkback in ConfirmLockPattern works similarly as
in ConfirmLockPassword to read out error messages.
Bug:
20282779
Change-Id: Ied05c284e959539cfbff965f33edd51c3bdfc9f9
Jason Monk [Mon, 1 Jun 2015 19:54:52 +0000 (19:54 +0000)]
Merge "Make Theme a DropDownPreference" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:12:22 +0000 (15:12 -0400)]
Make Theme a DropDownPreference
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.
Bug:
21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
Jason Monk [Mon, 1 Jun 2015 19:45:26 +0000 (19:45 +0000)]
Merge "Change name of search menu item to be more descriptive" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:21:07 +0000 (15:21 -0400)]
Change name of search menu item to be more descriptive
(for accessibility)
Bug:
20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
Maurice Lam [Mon, 1 Jun 2015 18:40:46 +0000 (18:40 +0000)]
Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 17:55:10 +0000 (17:55 +0000)]
Merge "Send sim change notification based on sim state change." into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 17:25:46 +0000 (10:25 -0700)]
Send sim change notification based on sim state change.
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.
Bug:
20739298
Bug:
18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
Maurice Lam [Mon, 1 Jun 2015 17:17:17 +0000 (17:17 +0000)]
Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
Stuart Scott [Mon, 20 Apr 2015 18:05:43 +0000 (11:05 -0700)]
Network Reset should have a lockdown like Factory Reset.
bug:
20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit
176f512c5ad8d8478db88fad4c14ffca52102ade)
Geoff Mendal [Mon, 1 Jun 2015 16:09:54 +0000 (09:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c
Auto-generated-cl: translation import
Geoff Mendal [Sat, 30 May 2015 22:28:38 +0000 (17:28 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
Maurice Lam [Mon, 4 May 2015 03:08:43 +0000 (20:08 -0700)]
[WifiSettings] Remove unused Wi-Fi icon
wifi_signal_light was replaced by wifi_signal (which can take any
color via theme attributes). Remove the unused assets.
Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
Maurice Lam [Wed, 20 May 2015 22:16:47 +0000 (15:16 -0700)]
[WifiSetup] Add + icon to Add another network
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.
Bug:
21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
Xiyuan Xia [Sat, 30 May 2015 03:28:49 +0000 (03:28 +0000)]
Merge "Ignore fp error message when not listening" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 23:17:24 +0000 (16:17 -0700)]
Ignore fp error message when not listening
Bug:
21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
Fyodor Kupolov [Fri, 22 May 2015 01:31:45 +0000 (18:31 -0700)]
Hide guest entry if the user is not allowed to create guest
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.
Bug:
19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
Fyodor Kupolov [Fri, 29 May 2015 20:42:55 +0000 (20:42 +0000)]
Merge "Use DimmableIconPreference for Add user action" into mnc-dev
Fyodor Kupolov [Fri, 29 May 2015 20:27:14 +0000 (20:27 +0000)]
Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
Fyodor Kupolov [Fri, 29 May 2015 18:17:32 +0000 (11:17 -0700)]
Hide the collapse/expand icon if text fits the screen
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.
Bug:
20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:22:09 +0000 (09:22 -0500)]
Import translations. DO NOT MERGE
Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
John Spurlock [Fri, 29 May 2015 02:20:44 +0000 (22:20 -0400)]
Settings: Migrate zen event conditions to use calendar name.
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.
Bug:
17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
Tony Mantler [Thu, 28 May 2015 21:48:29 +0000 (14:48 -0700)]
Move ZoneGetter into SettingsLib
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
Paul Lawrence [Thu, 28 May 2015 19:37:27 +0000 (19:37 +0000)]
Merge "Disable back button on crypto screen" into mnc-dev
Jason Monk [Thu, 28 May 2015 16:37:38 +0000 (16:37 +0000)]
Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev
Jason Monk [Thu, 28 May 2015 15:42:28 +0000 (11:42 -0400)]
Make use of WifiTracker's WorkerThread support
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.
Bug:
21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
Jason Monk [Thu, 28 May 2015 14:24:34 +0000 (14:24 +0000)]
Merge "More memory updates" into mnc-dev
Jason Monk [Wed, 27 May 2015 16:58:21 +0000 (12:58 -0400)]
More memory updates
- Some string changes
- Make processes in memory details not clickable
- Put processes in a 'detail' category
- Hide processes when an app only has 1
- Add memory item to bottom of app info page
Bug:
20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
John Spurlock [Thu, 28 May 2015 14:11:10 +0000 (14:11 +0000)]
Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
John Spurlock [Thu, 28 May 2015 14:07:29 +0000 (10:07 -0400)]
Settings: Update icon sizes for zen auto rules.
Bug:
21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
Jason Monk [Wed, 27 May 2015 20:02:08 +0000 (16:02 -0400)]
Help fallbacks and intent work
- Handle a backup URI, so that if the specified URI is not available,
another can be used.
- Add some data to help intents when they are intent URIs
- Fill in the context with a classname when it isn't present
Bug:
15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
Sanket Padawe [Thu, 28 May 2015 01:04:23 +0000 (18:04 -0700)]
Fix Eap method selection on screen rotation.
Bug:
19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
Paul Lawrence [Wed, 27 May 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Honor password visible setting in CryptKeeper" into mnc-dev
Adrian Roos [Wed, 27 May 2015 21:39:24 +0000 (14:39 -0700)]
Only show emergency app preference if enabled
Bug:
21471480
Change-Id: I93e5dcb9acb8be1220d2874d5bca764819139760
Andres Morales [Wed, 27 May 2015 20:59:27 +0000 (20:59 +0000)]
Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
Paul Lawrence [Thu, 14 May 2015 22:49:08 +0000 (15:49 -0700)]
Disable back button on crypto screen
The back button cannot do anything from this activity as it is
only ever launched first thing at boot. So do not permit going back.
Note that screens launched from here (emergency dialer, keyboard config)
still work and their back buttons still work.
Bug:
20730074
Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e
Paul Lawrence [Mon, 18 May 2015 20:25:01 +0000 (13:25 -0700)]
Honor password visible setting in CryptKeeper
Requires matching framework change:
https://googleplex-android-review.git.corp.google.com/#/c/692822/
Bug:
20184626
Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c
Andres Morales [Wed, 27 May 2015 20:04:38 +0000 (13:04 -0700)]
[ConfirmCredential] fix issue where patterns of length 4 are not checked
Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
Chad Brubaker [Wed, 27 May 2015 20:04:13 +0000 (20:04 +0000)]
Merge "Clear only keystore credential entires" into mnc-dev
Andres Morales [Wed, 27 May 2015 18:37:21 +0000 (18:37 +0000)]
Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
Maurice Lam [Wed, 27 May 2015 18:35:07 +0000 (18:35 +0000)]
Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
Jorim Jaggi [Wed, 27 May 2015 18:33:25 +0000 (18:33 +0000)]
Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 15:57:52 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Xiyuan Xia [Wed, 27 May 2015 15:54:34 +0000 (15:54 +0000)]
Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 15:54:34 +0000 (08:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import
Jason Monk [Tue, 26 May 2015 20:11:41 +0000 (16:11 -0400)]
Add no data usage string
Add a no data usage string so we can avoid showing incorrect dates
when no data is available.
Bug:
21076561
Change-Id: I4568cd750fe5f973fed0ff4ffa48412d8c6afd97
Jorim Jaggi [Wed, 27 May 2015 00:52:01 +0000 (17:52 -0700)]
Cancel enrollment when navigating out of enrollment
Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b
Xiyuan Xia [Tue, 26 May 2015 21:05:24 +0000 (21:05 +0000)]
Merge "No auto soft keyboard when fp is in use" into mnc-dev
Xiyuan Xia [Tue, 26 May 2015 20:17:10 +0000 (13:17 -0700)]
Fix transient Next button in confirm screen on orientation change
During orientation change, input method service could have stale
input editor info. The portrait mode password entry allows fullscreen
UI and it is made visible for a glimpse of second during the change.
This CL adds the flagNoFullscreen to portrait mode password entry
so that the transient switch to fullscreen UI does not happen.
Bug:
21073469
Change-Id: Ie9d21e46f88ad0395afb8750ab5d19e938685b89
Jason Monk [Tue, 26 May 2015 20:20:38 +0000 (20:20 +0000)]
Merge "Don't have app info pages load so much info" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:56:05 +0000 (15:56 -0400)]
Don't have app info pages load so much info
They don't need to resume the ApplicationsState session because they
only need info for one app, instead just make sure ApplicationsState
can load the info as requested.
Bug:
20696893
Change-Id: I146387438348fad1396ac4528819b2f1a93a97bf
John Spurlock [Tue, 26 May 2015 19:41:51 +0000 (19:41 +0000)]
Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
Jason Monk [Tue, 26 May 2015 19:22:18 +0000 (19:22 +0000)]
Merge "Fix crash while rotating with app info dialog up" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:09:38 +0000 (15:09 -0400)]
Fix crash while rotating with app info dialog up
Bug:
21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
Sanket Padawe [Tue, 26 May 2015 18:46:04 +0000 (18:46 +0000)]
Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
Maurice Lam [Thu, 21 May 2015 03:00:36 +0000 (20:00 -0700)]
[LockScreen] Setup Wizard pattern lock landscape layout
Create values-land/setup_choose_lock_pattern to implement the
landscape layout of the lock pattern. Also copied
values/setup_choose_lock_pattern to sw600dp so that this will be used
in tablet landscape.
Bug:
20916604
Change-Id: I6a2193c74dd10d79ed9e212cf51a625763d87e1a
John Spurlock [Wed, 20 May 2015 12:57:01 +0000 (08:57 -0400)]
Settings: Display corp profile calendars in event rule selection.
And sort the accounts by display name.
Bug:
21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3
Jason Monk [Tue, 26 May 2015 16:55:42 +0000 (16:55 +0000)]
Merge "Unbanish memory screen and new UX" into mnc-dev
Jason Monk [Thu, 21 May 2015 19:24:37 +0000 (15:24 -0400)]
Unbanish memory screen and new UX
Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.
Bug:
20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa
Andres Morales [Fri, 15 May 2015 22:20:33 +0000 (15:20 -0700)]
[LockSettings] pipe through HW throttle timeout
Bug:
21118563
Change-Id: I23f5af2ebef9dac981281fb04c055a02f3b159b8
Jason Monk [Wed, 20 May 2015 20:44:28 +0000 (16:44 -0400)]
Add permission summaries back in
Use broadcasts to ask the PackageInstaller about the number of
granted permissions.
Bug:
21078474
Change-Id: I91d88d145a803f5f6c3f3163ba1f4500d39b1943
The Android Automerger [Tue, 26 May 2015 08:03:14 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Geoff Mendal [Mon, 25 May 2015 15:57:08 +0000 (08:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60153a0868ea5ec670c3c3517ac032e616a1a0ef
Auto-generated-cl: translation import
The Android Automerger [Sat, 23 May 2015 08:06:19 +0000 (01:06 -0700)]
merge in mnc-release history after reset to mnc-dev
Jason Monk [Fri, 22 May 2015 17:41:48 +0000 (13:41 -0400)]
String changes for app links in settings
Bug:
21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
Sean Francis-Lyon [Fri, 22 May 2015 20:38:39 +0000 (20:38 +0000)]
Merge "DO NOT MERGE show correct backup status" into mnc-dev
Maurice Lam [Fri, 22 May 2015 19:33:19 +0000 (19:33 +0000)]
Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
Maurice Lam [Fri, 22 May 2015 19:27:10 +0000 (19:27 +0000)]
Merge "[WifiSetup] Update phone illustrations" into mnc-dev
Maurice Lam [Fri, 22 May 2015 18:59:43 +0000 (11:59 -0700)]
[WifiSetup] Align to mac address to locale start
Set the textDirection of the mac address view to "locale" instead of
the inherited default of "firstStrong", so that the address itself is
always aligned with the label.
Bug:
21396886
Change-Id: I143ec069bde56d34484e8839c60386de268bb930
Jason Monk [Fri, 22 May 2015 17:41:48 +0000 (13:41 -0400)]
String changes for app links in settings
Bug:
21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
Chad Brubaker [Thu, 21 May 2015 22:57:24 +0000 (15:57 -0700)]
Clear only keystore credential entires
Instead of reseting the whole user only clear the uids that are used
for credential storage. These are limited to only WIFI, VPN, ROOT and
System. This prevents applications that use keystore for crypto keys
from losing their keys when the user clears credentials.
Previously when reset was called the next time the user unlocked the
keystore it would be reinitialized with the user's password however this
behavior was removed from keystore causing a loop of unlock prompts from
CredentialStorage when trying to install a new certificate after clearing
the storage.
Additionally this makes clear credentials clear any managed profiles as
well, previously it only cleared the current user.
Bug:
21373935
Change-Id: Id86ec0bc66a4f6c0d5e649bead007007e2fc8268
Maurice Lam [Fri, 22 May 2015 18:30:51 +0000 (11:30 -0700)]
[WifiSetup] Update phone illustrations
Update illustrations in phone layout, to move the buildings up so
that they are not shown when the header is sticky.
Bug:
20954868
Change-Id: I3db4ac19901b5e5fdaeef3bdabe94e81e40b159c
Xiyuan Xia [Thu, 21 May 2015 18:12:19 +0000 (11:12 -0700)]
No auto soft keyboard when fp is in use
Bug:
20861013
Change-Id: Ia788e4c5dbabef374d08c7cb063ef2c07bbdb078
Jim Miller [Fri, 22 May 2015 01:42:23 +0000 (01:42 +0000)]
Merge "Fix crash in fingerprint settings." into mnc-dev
Jim Miller [Thu, 21 May 2015 01:14:55 +0000 (18:14 -0700)]
Fix crash in fingerprint settings.
Fixes bug
21333219
Fixes bug
21336059
Change-Id: I3e5c9257affd10ace6b55f6d0b2ddbf3babf30f1
Jason Monk [Wed, 20 May 2015 17:35:43 +0000 (13:35 -0400)]
Remove data item from app info when not supported
Bug:
21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
Dave Langemak [Thu, 21 May 2015 23:56:25 +0000 (23:56 +0000)]
Merge "Banish Theme setting to developer options" into mnc-dev
Sean Francis-Lyon [Thu, 21 May 2015 01:30:00 +0000 (18:30 -0700)]
DO NOT MERGE show correct backup status
show correct backup status after dismissing are-you-sure dialog
for turnning off backup and restore in settings
Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
(cherry picked from commit
f833588dae5ff7e1e6ed0723ee28b5f7684e8077)
Maurice Lam [Thu, 21 May 2015 21:55:48 +0000 (21:55 +0000)]
Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
Jorim Jaggi [Thu, 21 May 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Fix string for fingerprint settings" into mnc-dev
Jason Monk [Thu, 21 May 2015 20:46:24 +0000 (16:46 -0400)]
Banish Theme setting to developer options
Bug:
21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
Jason Monk [Thu, 21 May 2015 20:13:37 +0000 (20:13 +0000)]
Merge "Fix loading screen one more time" into mnc-dev