John Spurlock
e2b5b7fd98
am 9dbd6165
: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
...
* commit '9dbd616541de32df34562a4ee8cb8ee28757923c':
Settings: Update icon sizes for zen auto rules.
2015-05-28 14:18:41 +00:00
Jason Monk
ef4ec26032
am 15dcebe1
: Help fallbacks and intent work
...
* commit '15dcebe1e79ad396a08873f940e2f33d432cf387':
Help fallbacks and intent work
2015-05-28 14:18:38 +00:00
John Spurlock
9dbd616541
Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
2015-05-28 14:11:10 +00:00
John Spurlock
e6f9c110c7
Settings: Update icon sizes for zen auto rules.
...
Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
2015-05-28 10:07:29 -04:00
Jason Monk
15dcebe1e7
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
2015-05-28 09:50:45 -04:00
Sanket Padawe
56eb3e611d
am ecf4339b
: Fix Eap method selection on screen rotation.
...
* commit 'ecf4339bc74f8d4fb504e8f32b1d4828e9975e37':
Fix Eap method selection on screen rotation.
2015-05-28 01:23:47 +00:00
Sanket Padawe
ecf4339bc7
Fix Eap method selection on screen rotation.
...
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
2015-05-27 18:04:23 -07:00
Paul Lawrence
70aae38d3d
am 90e9a903
: Merge "Honor password visible setting in CryptKeeper" into mnc-dev
...
* commit '90e9a9031215ae40c058d3c2b7474f8eb28fde44':
Honor password visible setting in CryptKeeper
2015-05-27 22:31:19 +00:00
Paul Lawrence
90e9a90312
Merge "Honor password visible setting in CryptKeeper" into mnc-dev
2015-05-27 22:15:51 +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
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
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
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
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
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
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
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
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
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
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
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
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