Commit Graph

20293 Commits

Author SHA1 Message Date
Sanket Padawe
6d9500d04c Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 2015-05-26 18:46:04 +00:00
Maurice Lam
dcf05e5cb6 [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
2015-05-26 11:29:35 -07:00
Jason Monk
5b1c03293c am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev
* commit '7231147b567aaf1c495eae569723c5dd7268c9e0':
  Unbanish memory screen and new UX
2015-05-26 17:05:18 +00:00
John Spurlock
fa76a652e4 Settings: Display corp profile calendars in event rule selection.
And sort the accounts by display name.

Bug: 21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3
2015-05-26 12:55:56 -04:00
Jason Monk
7231147b56 Merge "Unbanish memory screen and new UX" into mnc-dev 2015-05-26 16:55:42 +00:00
Jason Monk
3f058ca1c8 am e9866b6d: Add permission summaries back in
* commit 'e9866b6dc47201630c057f946423d572b8c46af8':
  Add permission summaries back in
2015-05-26 16:41:42 +00:00
Jason Monk
beb171d2e5 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
2015-05-26 11:41:37 -04:00
Andres Morales
91e6c499ca [LockSettings] pipe through HW throttle timeout
Bug: 21118563
Change-Id: I23f5af2ebef9dac981281fb04c055a02f3b159b8
2015-05-26 08:25:12 -07:00
Jason Monk
e9866b6dc4 Add permission summaries back in
Use broadcasts to ask the PackageInstaller about the number of
granted permissions.

Bug: 21078474
Change-Id: I91d88d145a803f5f6c3f3163ba1f4500d39b1943
2015-05-26 10:28:21 -04:00
The Android Automerger
c9d034b013 merge in mnc-release history after reset to mnc-dev 2015-05-26 01:03:14 -07:00
Geoff Mendal
eec237769a am 85a72a90: (-s ours) Import translations. DO NOT MERGE
* commit '85a72a9088d6be0cd0fda03d0e80a24a8fcaa4cb':
  Import translations. DO NOT MERGE
2015-05-25 16:11:25 +00:00
Geoff Mendal
85a72a9088 Import translations. DO NOT MERGE
Change-Id: I60153a0868ea5ec670c3c3517ac032e616a1a0ef
Auto-generated-cl: translation import
2015-05-25 08:57:08 -07:00
The Android Automerger
55aff85432 merge in mnc-release history after reset to mnc-dev 2015-05-23 01:06:19 -07:00
Sean Francis-Lyon
19c39d275d am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev
* commit '389cf343805c0d40af720a06ead6e92bdd512527':
  DO NOT MERGE show correct backup status
2015-05-22 20:51:50 +00:00
Jason Monk
db006f8db4 String changes for app links in settings
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
2015-05-22 13:46:06 -07:00
Sean Francis-Lyon
389cf34380 Merge "DO NOT MERGE show correct backup status" into mnc-dev 2015-05-22 20:38:41 +00:00
Maurice Lam
b2c02e2709 am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
* commit 'df8d8907a867e4d93f42d0a305371124b4fd599d':
  [WifiSetup] Align to mac address to locale start
2015-05-22 19:35:30 +00:00
Maurice Lam
db0e8b65e0 am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
* commit '6fdd06dcfc82a246911b1b285b4b6e4f41d0b8fc':
  [WifiSetup] Update phone illustrations
2015-05-22 19:35:29 +00:00
Maurice Lam
df8d8907a8 Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev 2015-05-22 19:33:19 +00:00
Maurice Lam
6fdd06dcfc Merge "[WifiSetup] Update phone illustrations" into mnc-dev 2015-05-22 19:27:10 +00:00
Maurice Lam
cd3fbba9b7 [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
2015-05-22 11:59:43 -07:00
Jason Monk
cf55da1ef5 am b2f11d01: String changes for app links in settings
* commit 'b2f11d013cc95ba9bebb62cdcbd06a3920872d24':
  String changes for app links in settings
2015-05-22 18:51:34 +00:00
Jason Monk
b2f11d013c String changes for app links in settings
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
2015-05-22 14:42:45 -04:00
Chad Brubaker
ce10b5edf0 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
2015-05-22 11:31:19 -07:00
Maurice Lam
65079b2d3c [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
2015-05-22 11:30:51 -07:00
Xiyuan Xia
4f8102d4f2 No auto soft keyboard when fp is in use
Bug:20861013
Change-Id: Ia788e4c5dbabef374d08c7cb063ef2c07bbdb078
2015-05-21 20:14:24 -07:00
Jim Miller
549d5ec89e am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev
* commit 'c499a5fe9d6632fa73104dcc88a9e2c2cd390dde':
  Fix crash in fingerprint settings.
2015-05-22 01:50:13 +00:00
Jim Miller
c499a5fe9d Merge "Fix crash in fingerprint settings." into mnc-dev 2015-05-22 01:42:27 +00:00
Jim Miller
622142ce9d Fix crash in fingerprint settings.
Fixes bug 21333219
Fixes bug 21336059

Change-Id: I3e5c9257affd10ace6b55f6d0b2ddbf3babf30f1
2015-05-21 18:40:02 -07:00
Jason Monk
fcb916b59c Remove data item from app info when not supported
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
2015-05-21 17:30:37 -07:00
Dave Langemak
1c1e85dc5f am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
* commit 'ea9b3198b43ac7c67c9a4ff3e27bb133fd0c6293':
  Banish Theme setting to developer options
2015-05-22 00:06:18 +00:00
Dave Langemak
ea9b3198b4 Merge "Banish Theme setting to developer options" into mnc-dev 2015-05-21 23:56:25 +00:00
Sean Francis-Lyon
8452a62216 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 f833588dae)
2015-05-21 22:42:56 +00:00
Maurice Lam
03d1299646 am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
* commit '51eec32afa0d4599b437b1823a2b42d44d9bf001':
  [LockScreenSetup] Move retry button to top
2015-05-21 22:06:29 +00:00
Maurice Lam
51eec32afa Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 2015-05-21 21:55:48 +00:00
Jorim Jaggi
c8f78ec956 am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
* commit '19ea8b703455cf326e7c481e33e757ff0ddfed62':
  Fix string for fingerprint settings
2015-05-21 21:32:37 +00:00
Jorim Jaggi
19ea8b7034 Merge "Fix string for fingerprint settings" into mnc-dev 2015-05-21 21:23:57 +00:00
Jason Monk
df283601c5 Banish Theme setting to developer options
Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
2015-05-21 16:46:24 -04:00
Jason Monk
837dfca0fa am ce6f1651: Merge "Fix loading screen one more time" into mnc-dev
* commit 'ce6f165104fb8c567c13369bae97935e29c47f4c':
  Fix loading screen one more time
2015-05-21 20:26:21 +00:00
Jason Monk
ce6f165104 Merge "Fix loading screen one more time" into mnc-dev 2015-05-21 20:13:37 +00:00
Jason Monk
74ecb1f211 Fix loading screen one more time
Don't rebuild the app list until the entry load is complete to avoid
having a slowly populating list shown to the user.

Bug: 21086054
Change-Id: I801ab292fdbf6801c1b9c8f957336660810da5f6
2015-05-21 16:09:41 -04:00
Xiyuan Xia
491a6b1389 am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev
* commit 'a0e052b17b0c730dcd61ad2787c041c75107f106':
  Do not show soft keyboard when locked out
2015-05-21 16:22:30 +00:00
Xiyuan Xia
a0e052b17b Merge "Do not show soft keyboard when locked out" into mnc-dev 2015-05-21 16:16:07 +00:00
Jason Monk
939ee55954 am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev
* commit 'b2e07cd0f9e2a869710c6b713f403afc4fbdbfab':
  Remove data item from app info when not supported
2015-05-21 13:05:57 +00:00
Jason Monk
b2e07cd0f9 Merge "Remove data item from app info when not supported" into mnc-dev 2015-05-21 12:55:31 +00:00
Jason Monk
b45e27bc0f Remove data item from app info when not supported
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
2015-05-21 08:43:25 -04:00
The Android Automerger
f74ae87f35 merge in mnc-release history after reset to mnc-dev 2015-05-21 01:04:45 -07:00
Geoff Mendal
e008b99d44 am 462e7008: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '462e70083fbdd12da55b6a6b98a59750d250f40d':
  Import translations. DO NOT MERGE
2015-05-21 03:30:37 +00:00
John Spurlock
8b9dbbe0c8 am fffa7f90: Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
* commit 'fffa7f905b809659c3edbbb1663f3a74ce5625bc':
  Settings: Auto-capitalize edit text for zen autorule names.
2015-05-21 03:30:36 +00:00
Geoff Mendal
462e70083f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 03:26:57 +00:00