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
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
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
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
John Spurlock
ad17aea79d
am d070d52a
: am 90f5f4cb
: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
...
* commit 'd070d52a7b8d9cf96fe96027cb089ab5d999c7c9':
Settings: Display corp profile calendars in event rule selection.
2015-05-26 20:08:28 +00:00
John Spurlock
d070d52a7b
am 90f5f4cb
: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
...
* commit '90f5f4cbd1099d2afe993fff0bc7c620a64f1576':
Settings: Display corp profile calendars in event rule selection.
2015-05-26 19:55:32 +00:00
Jason Monk
ff24d5d941
am 969b5842
: am 49ad08e2
: am 1ecfc645
: Merge "Fix crash while rotating with app info dialog up" into mnc-dev
...
* commit '969b58420fbe5620a367e134f9cc1b15aa773365':
Fix crash while rotating with app info dialog up
2015-05-26 19:55:20 +00:00
Jason Monk
969b58420f
am 49ad08e2
: am 1ecfc645
: Merge "Fix crash while rotating with app info dialog up" into mnc-dev
...
* commit '49ad08e20fda90f03bb89ba395a6d14d00406a25':
Fix crash while rotating with app info dialog up
2015-05-26 19:42:10 +00:00
John Spurlock
90f5f4cbd1
Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
2015-05-26 19:41:55 +00:00
Jason Monk
49ad08e20f
am 1ecfc645
: Merge "Fix crash while rotating with app info dialog up" into mnc-dev
...
* commit '1ecfc645ee74ddcc7555f44291943f75581a4f8e':
Fix crash while rotating with app info dialog up
2015-05-26 19:29:22 +00:00
Jason Monk
1ecfc645ee
Merge "Fix crash while rotating with app info dialog up" into mnc-dev
2015-05-26 19:22:18 +00:00
Sanket Padawe
6c30d05691
am 9c62ddec
: am 86dbdff1
: am 6d9500d0
: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
...
* commit '9c62ddeca6de29eb6cfd2129cbe69c41046c5bdb':
Fix generation of pin for WPS on screen rotation.
2015-05-26 19:17:16 +00:00
Jason Monk
5e2529aeb4
Fix crash while rotating with app info dialog up
...
Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
2015-05-26 15:12:18 -04:00
Sanket Padawe
9c62ddeca6
am 86dbdff1
: am 6d9500d0
: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
...
* commit '86dbdff1fa203b415929fb6c65fa431d56e7eaa8':
Fix generation of pin for WPS on screen rotation.
2015-05-26 19:09:29 +00:00
Sanket Padawe
86dbdff1fa
am 6d9500d0
: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
...
* commit '6d9500d04c64d05ad0b9b054c72b0e2fd1b866fc':
Fix generation of pin for WPS on screen rotation.
2015-05-26 18:58:07 +00:00
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
e224c39795
am 1737c2e5
: am 5b1c0329
: am 7231147b
: Merge "Unbanish memory screen and new UX" into mnc-dev
...
* commit '1737c2e5ef093a4db2ec1ede8ad523e62ce1f61f':
Unbanish memory screen and new UX
2015-05-26 17:28:16 +00:00
Jason Monk
1737c2e5ef
am 5b1c0329
: am 7231147b
: Merge "Unbanish memory screen and new UX" into mnc-dev
...
* commit '5b1c03293c5e0914f773644b2958d321dc83afbe':
Unbanish memory screen and new UX
2015-05-26 17:13:47 +00:00