Commit Graph

20697 Commits

Author SHA1 Message Date
Andres Morales
86166a4b2c am 02122f6a: am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
* commit '02122f6ab3825c14b0b47f82b76200083a5908ae':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:49:11 +00:00
Andres Morales
02122f6ab3 am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
* commit 'fb171c214f905c20053f7ced9f981bccb8275b29':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:34:22 +00:00
Andres Morales
fb171c214f am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
* commit '27c13e5dc6444be87af26e545e4e1163c3767ffc':
  [ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:15:56 +00:00
Chad Brubaker
c0e6d21601 am fdda3f5d: am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev
* commit 'fdda3f5dc79e6c7eba04b0304bff612c4e99a7d4':
  Clear only keystore credential entires
2015-05-27 21:01:18 +00:00
Andres Morales
6f9e4a19ae am 6e3a182f: am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
* commit '6e3a182f9b6d8fd442408bb2eb1baa868a2257d0':
  [LockSettings] pipe through HW throttle timeout
2015-05-27 21:01:17 +00:00
Maurice Lam
a80694d476 am 2991c526: am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
* commit '2991c52600a15205e6ca0aac76e6e5b00149c23a':
  [LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 21:01:15 +00:00
Jorim Jaggi
265c85c261 am 57aeea92: am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
* commit '57aeea920e06a8a192462e6b94a1fc8cffa5044b':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode
2015-05-27 21:01:14 +00:00
Andres Morales
27c13e5dc6 Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 2015-05-27 20:59:28 +00:00
Chad Brubaker
fdda3f5dc7 am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev
* commit '08ffcb996e5a54cf127e2ab87ee6689c23e0177e':
  Clear only keystore credential entires
2015-05-27 20:45:54 +00:00
Andres Morales
6e3a182f9b am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
* commit '6042133f48b340b24babc8c590b874ddac9dfe6f':
  [LockSettings] pipe through HW throttle timeout
2015-05-27 20:45:52 +00:00
Maurice Lam
2991c52600 am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
* commit '08b13b0239e70bcb2268cb7ae1aee090300efe81':
  [LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 20:45:50 +00:00
Jorim Jaggi
57aeea920e am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
* commit '30ddbcdb680d1ace092fe8e377542a0f6dfc8436':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode
2015-05-27 20:45:49 +00:00
Paul Lawrence
2a6552ed50 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
2015-05-27 20:34:14 +00:00
Paul Lawrence
c04420ce25 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
2015-05-27 20:33:46 +00:00
Chad Brubaker
08ffcb996e am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev
* commit '227ba29e3947c8d53cb4a8138f0c3f209ae414e3':
  Clear only keystore credential entires
2015-05-27 20:23:44 +00:00
Andres Morales
6042133f48 am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
* commit 'b5746cb19bef50036eae2353714bc50ff491ba68':
  [LockSettings] pipe through HW throttle timeout
2015-05-27 20:23:42 +00:00
Maurice Lam
08b13b0239 am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
* commit '6fd26aae0d47b6f8ddd472abc8f86cd65c796fda':
  [LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 20:23:41 +00:00
Jorim Jaggi
30ddbcdb68 am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
* commit 'fd5ec09fe2152c67dc0b529803abc8f5f25f6b7c':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode
2015-05-27 20:23:39 +00:00
Andres Morales
864d13e2c9 [ConfirmCredential] fix issue where patterns of length 4 are not checked
Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
2015-05-27 13:04:38 -07:00
Chad Brubaker
227ba29e39 Merge "Clear only keystore credential entires" into mnc-dev 2015-05-27 20:04:14 +00:00
Andres Morales
b5746cb19b Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev 2015-05-27 18:37:53 +00:00
Maurice Lam
6fd26aae0d Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 2015-05-27 18:35:09 +00:00
Jorim Jaggi
fd5ec09fe2 Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev 2015-05-27 18:33:26 +00:00
Geoff Mendal
5c5288378a am 842a597f: (-s ours) am 41b0e87d: (-s ours) am fc05d801: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '842a597fb63bd3194427781b89a6e904854661ee':
  Import translations. DO NOT MERGE
2015-05-27 16:39:13 +00:00
Xiyuan Xia
4ab225a9e2 am dfba393e: am d82fcc9d: am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
* commit 'dfba393eada1f46bf53111a5e5deb72d5bc484ff':
  Fix transient Next button in confirm screen on orientation change
2015-05-27 16:39:12 +00:00
Geoff Mendal
842a597fb6 am 41b0e87d: (-s ours) am fc05d801: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '41b0e87d9af7740053b42f7580bf3a1a9a7a6016':
  Import translations. DO NOT MERGE
2015-05-27 16:25:08 +00:00
Xiyuan Xia
dfba393ead am d82fcc9d: am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
* commit 'd82fcc9dfec91d8dda5c12303ed2948dc727cf0e':
  Fix transient Next button in confirm screen on orientation change
2015-05-27 16:25:07 +00:00
Geoff Mendal
41b0e87d9a am fc05d801: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'fc05d8010230e410b4acbff6d629ef7b0834b265':
  Import translations. DO NOT MERGE
2015-05-27 16:07:56 +00:00
Xiyuan Xia
d82fcc9dfe am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
* commit '4ae8b37c58350209cd097eff2598aefda2441956':
  Fix transient Next button in confirm screen on orientation change
2015-05-27 16:07:55 +00:00
Geoff Mendal
fc05d80102 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-27 15:57:53 +00:00
Xiyuan Xia
4ae8b37c58 Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 2015-05-27 15:54:35 +00:00
Geoff Mendal
61ab32fdc6 Import translations. DO NOT MERGE
Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import
2015-05-27 08:54:34 -07:00
Geoff Mendal
13026a66a9 Merge "Import translations. DO NOT MERGE" 2015-05-27 15:27:58 +00:00
Geoff Mendal
ae62051650 Import translations. DO NOT MERGE
Change-Id: Idfa2d231040fa6a39e323518d63e6e39e2ec5a04
Auto-generated-cl: translation import
2015-05-27 07:56:18 -07:00
Jason Monk
bae05490bb am 4562d9f5: am 4b34804b: am 51334310: Add no data usage string
* commit '4562d9f57a904560c8f43500ccdf99b42d533e7f':
  Add no data usage string
2015-05-27 14:30:18 +00:00
Jason Monk
4562d9f57a am 4b34804b: am 51334310: Add no data usage string
* commit '4b34804b5124f8b71b14d4fbacedb948e5ec6820':
  Add no data usage string
2015-05-27 14:17:54 +00:00
Jason Monk
4b34804b51 am 51334310: Add no data usage string
* commit '51334310a26a29d3ac3ad4e7299110b6de0ae75c':
  Add no data usage string
2015-05-27 14:03:06 +00:00
Jason Monk
51334310a2 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
2015-05-27 09:02:16 -04:00
Jorim Jaggi
bc68ba22f1 Cancel enrollment when navigating out of enrollment
Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b
2015-05-26 17:52:01 -07:00
Xiyuan Xia
9e1cdbe139 am 3c123ad7: am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev
* commit '3c123ad726892edce6df173787ff89e103332b70':
  No auto soft keyboard when fp is in use
2015-05-26 21:37:38 +00:00
Xiyuan Xia
3c123ad726 am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev
* commit '3d36f54abcec1bb110e6c5e8e78fa2af5edf79e6':
  No auto soft keyboard when fp is in use
2015-05-26 21:27:18 +00:00
Xiyuan Xia
3d36f54abc am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev
* commit 'a4e0492c11fb7b02c9a536ea4935e649e97c8c2d':
  No auto soft keyboard when fp is in use
2015-05-26 21:14:38 +00:00
Xiyuan Xia
a4e0492c11 Merge "No auto soft keyboard when fp is in use" into mnc-dev 2015-05-26 21:05:27 +00:00
Jason Monk
87dfa5d1dd am 50ea0493: am ec39177c: am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev
* commit '50ea0493c38e682ad79cc92c4cb8404fe993932c':
  Don't have app info pages load so much info
2015-05-26 20:50:17 +00:00
Jason Monk
50ea0493c3 am ec39177c: am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev
* commit 'ec39177c2bca1fb1e8b0b1fffccf05749d27d226':
  Don't have app info pages load so much info
2015-05-26 20:42:36 +00:00
Xiyuan Xia
22e1ef222a 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
2015-05-26 13:39:03 -07:00
Jason Monk
ec39177c2b am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev
* commit '44fb627cf67dfa3b9c2c625fd39ca8e9a9829813':
  Don't have app info pages load so much info
2015-05-26 20:30:23 +00:00
John Spurlock
c72930e51a am ad17aea7: am d070d52a: am 90f5f4cb: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
* commit 'ad17aea79d1b88bcada71cfda3ac616ad1755543':
  Settings: Display corp profile calendars in event rule selection.
2015-05-26 20:23:13 +00:00
Jason Monk
44fb627cf6 Merge "Don't have app info pages load so much info" into mnc-dev 2015-05-26 20:20:38 +00:00
Jason Monk
646befdd16 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
2015-05-26 16:20:09 -04:00