Maurice Lam
2d94f9fd68
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172 am: c67ad0184a
...
am: 7e81460665
* commit '7e814606650ef88bfa60115f6c1269a422603da3':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I5c3c9b459cf65d8d8007bf10ee941e24284d57fd
2016-05-13 01:11:14 +00:00
Maurice Lam
7e81460665
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
...
am: c67ad0184a
* commit 'c67ad0184ac4c2ac1fc07330801972499e38da2e':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I539c7c36f550f5cd60fb3e05f91dfa58b0a5077f
2016-05-13 01:02:14 +00:00
Maurice Lam
c67ad0184a
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
...
am: 102b368172
* commit '102b368172b4e8201b32efb686b3f3334e5ddbda':
[ScreenLock] Use requested quality for encryption popup
Change-Id: Ie7d91698bc3e81d4149dc6b8ab96bf00c5d4451e
2016-05-13 00:59:26 +00:00
Maurice Lam
102b368172
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
2016-05-13 00:51:09 +00:00
Maurice Lam
8890f7acbd
[ScreenLock] Use requested quality for encryption popup
...
Use the requested password quality instead of the currently-in-use
password quality because encryption interstitial is shown before
the lock type is updated.
Bug: 28326234
Change-Id: I9ae950bab48f62033c59b582218c8a586f5b71ba
2016-05-12 16:24:41 -07:00
Adrian Roos
373060c2a3
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a am: 1d1ca8e590
...
am: 3b7eedabb8
* commit '3b7eedabb85f18229911a67d91864849532f8bba':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Iadad066e04fde46b247634b9f2d36f472deb4285
2016-05-12 21:06:07 +00:00
Adrian Roos
3b7eedabb8
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
...
am: 1d1ca8e590
* commit '1d1ca8e5905c100efde0ffdfcc8b1dcc7dbc32c8':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I2e2310c09f240beb92146d8d24c4bc6fdc413364
2016-05-12 21:02:28 +00:00
Adrian Roos
e7c67aae22
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Ieaa1f148c3db5fc41e1bb51faf987eac1b896bd4
2016-05-12 21:00:03 +00:00
Adrian Roos
1d1ca8e590
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
2016-05-12 20:59:47 +00:00
Adrian Roos
ef505d628a
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
2016-05-12 20:52:25 +00:00
Adrian Roos
059b0fa060
Allow DPMs to restrict Remote Input on Keyguard
...
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes: 26981262
2016-05-12 19:12:17 +00:00
Fan Zhang
c6b411d58a
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev am: f5746f9078
...
am: 1fb38d03bf
* commit '1fb38d03bf6c9ce43114f0ec9f20c07b6c93e3cc':
Update suggestion/support UI to use more negative space.
Change-Id: Ibfa15b9c1c8d8f3b29dd3c7b31cee03c9021af7b
2016-05-12 18:53:55 +00:00
Fan Zhang
1fb38d03bf
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
...
am: f5746f9078
* commit 'f5746f90781c40380f8ec3057abcf9c67d830882':
Update suggestion/support UI to use more negative space.
Change-Id: Ie1f58f267b284735b7f2c86741a516d385f07530
2016-05-12 18:51:10 +00:00
Fan Zhang
f5746f9078
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
2016-05-12 18:41:11 +00:00
Fan Zhang
50cde75ef7
Update suggestion/support UI to use more negative space.
...
Bug: 28435214
-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.
Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
2016-05-12 11:14:59 -07:00
Julia Reynolds
42285400e2
Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 am: 9e38c73cd2
...
am: 5e933b5565
* commit '5e933b5565d6cf327209a3171a4b2659478ec045':
Update lock timeout value after pref change.
Change-Id: I73288fdf3e24db764a8500308f681e12dcb6d492
2016-05-12 18:01:08 +00:00
Julia Reynolds
5e933b5565
Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005
...
am: 9e38c73cd2
* commit '9e38c73cd268d47be7864fe3da23d02d9506ca6e':
Update lock timeout value after pref change.
Change-Id: I272dd4d3c5f5746eb4c3c9c6d5870c54402ae511
2016-05-12 17:58:30 +00:00
Julia Reynolds
d9dffc6080
Merge "Update lock timeout value after pref change." into nyc-dev
...
am: 1590b8c005
* commit '1590b8c0055057a392883fe891d21fc659b60813':
Update lock timeout value after pref change.
Change-Id: Ib9da57d196586c76133dd25e918c92c05bc08eba
2016-05-12 17:55:56 +00:00
Julia Reynolds
9e38c73cd2
Merge "Update lock timeout value after pref change." into nyc-dev
...
am: 1590b8c005
* commit '1590b8c0055057a392883fe891d21fc659b60813':
Update lock timeout value after pref change.
Change-Id: Ie86247323910b78fe0623a011f677b4e4fd148d2
2016-05-12 17:55:56 +00:00
Julia Reynolds
1590b8c005
Merge "Update lock timeout value after pref change." into nyc-dev
2016-05-12 17:53:27 +00:00
Julia Reynolds
de4f471e55
Update lock timeout value after pref change.
...
Change-Id: I0d16256cb61e2db481d99349cd49c17e51de7c87
Fixes: 28734916
2016-05-12 13:48:34 -04:00
Gustav Sennton
0c779ab145
Merge "Disable WebViewSetting for non-admin users." into nyc-dev am: f76993a9da am: 04af74dae0
...
am: c75f6c127d
* commit 'c75f6c127d9f72294750e60ea3de84a4dae74743':
Disable WebViewSetting for non-admin users.
Change-Id: Ic1ce531a79bae7c262e06612fc72bf76507a0516
2016-05-12 13:34:08 +00:00
Gustav Sennton
c75f6c127d
Merge "Disable WebViewSetting for non-admin users." into nyc-dev am: f76993a9da
...
am: 04af74dae0
* commit '04af74dae09735e8852214772f48bcd5445c3211':
Disable WebViewSetting for non-admin users.
Change-Id: Icd15a907afa9c1afdf38e6f5640b6fb584fb82d3
2016-05-12 13:31:39 +00:00
Gustav Sennton
04af74dae0
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
...
am: f76993a9da
* commit 'f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: Icc42bdd0c0737be358301a6697db05df079a3941
2016-05-12 13:29:11 +00:00
Gustav Sennton
6e9836845f
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
...
am: f76993a9da
* commit 'f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: I08f5f7888ee22844aed287d27458149875b0320f
2016-05-12 13:29:11 +00:00
Gustav Sennton
f76993a9da
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
2016-05-12 13:23:55 +00:00
Gustav Sennton
66313bb11d
Disable WebViewSetting for non-admin users.
...
For an app to be able to know whether the WebViewSetting is enabled for
a user we disable the setting at boot for non-admin users. In this way
an app can call intent.resolveActivity[Info] for the WebViewSetting
intent to check whether the WebViewSetting is enabled before linking to
it.
Bug: 28034166
Change-Id: I33b3fa10a38f2a2600cddd0891ef746126abdd61
2016-05-12 11:13:26 +01:00
Jim Miller
c522236cd4
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25 am: ee4865ba14
...
am: 109d2c5d80
* commit '109d2c5d80cc13b4f9d17660480c93427efa86df':
Show signal strength indication while in CryptKeeper
Change-Id: I772b2d1a5f3048b9ef65294aa5c92c591ce8f9fd
2016-05-12 02:45:22 +00:00
Dianne Hackborn
7e53eb4710
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 am: c553d79b39
...
am: 6a3fea9e78
* commit '6a3fea9e78e9d8cfe46d80e9b6551a219593469c':
Fix issue #28400000 : Settings memory UI still showing z-ram...
Change-Id: I5b66695bc1dbe7c06430277bcd2570a2137376f3
2016-05-12 02:45:20 +00:00
Jim Miller
109d2c5d80
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25
...
am: ee4865ba14
* commit 'ee4865ba1484a5da8a2d2022dfc1b4a4c3fedd9e':
Show signal strength indication while in CryptKeeper
Change-Id: I1f38358b45ef9f4043692860df0c194ab1ad8d61
2016-05-12 02:23:54 +00:00
Jim Miller
975d4245b3
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
...
am: 3086911e25
* commit '3086911e2578ca7391c46f230edfb0f968dec38e':
Show signal strength indication while in CryptKeeper
Change-Id: I68e310a264404efe0f2839d6047e091925da8cb1
2016-05-12 02:12:54 +00:00
Jim Miller
ee4865ba14
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
...
am: 3086911e25
* commit '3086911e2578ca7391c46f230edfb0f968dec38e':
Show signal strength indication while in CryptKeeper
Change-Id: If8dcd37239bc2aedeb4fcc97da715c21b4d53639
2016-05-12 02:06:50 +00:00
Jim Miller
3086911e25
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
2016-05-12 01:52:34 +00:00
Dianne Hackborn
6a3fea9e78
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839
...
am: c553d79b39
* commit 'c553d79b39fc819279a57bd31e14b3cf9acb6a18':
Fix issue #28400000 : Settings memory UI still showing z-ram...
Change-Id: I8f828474689daad2e300bcb22b3a32b04af1f8fa
2016-05-12 01:12:44 +00:00
Dianne Hackborn
c553d79b39
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
...
am: 2dec0c7839
* commit '2dec0c7839784940601df3f2110a552a5cf73400':
Fix issue #28400000 : Settings memory UI still showing z-ram...
Change-Id: I6d31dd4cd2dc9c56bb0ee131e7de667d3e5cb6de
2016-05-12 00:51:45 +00:00
Dianne Hackborn
c55d3e0ee8
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
...
am: 2dec0c7839
* commit '2dec0c7839784940601df3f2110a552a5cf73400':
Fix issue #28400000 : Settings memory UI still showing z-ram...
Change-Id: Id9e43e234b5aaac86dd94d36ccd051d22ad5bdd4
2016-05-12 00:51:36 +00:00
Dianne Hackborn
2dec0c7839
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
2016-05-12 00:40:16 +00:00
Sudheer Shanka
f3d130aab9
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 am: eeeb02fefb
...
am: 6c3bff4930
* commit '6c3bff493095ffd1f768c1cac159fc112c3fd351':
Add policy transparency to app notification settings on lockscreen.
Change-Id: Ie6f897b89986f7e1dcb59a1ceced3ce6ba4ae2a8
2016-05-11 21:51:48 +00:00
Dianne Hackborn
a24b836e85
Fix issue #28400000 : Settings memory UI still showing z-ram...
...
...but probably shouldn't.
Change-Id: I3becb68a9989d915d11439b7beec1fe262261f78
2016-05-11 14:22:05 -07:00
Sudheer Shanka
6c3bff4930
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76
...
am: eeeb02fefb
* commit 'eeeb02fefbb8d8e3dbe70a8862cf21ac9ac55736':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I46f14c2de931a132cc27bc678293f9e028812758
2016-05-11 19:22:24 +00:00
Sudheer Shanka
eeeb02fefb
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
...
am: 938501cf76
* commit '938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I2aa5788fa98cf5ac128c161fcb0123b26eae1d7b
2016-05-11 19:14:11 +00:00
Sudheer Shanka
28c44ebf65
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
...
am: 938501cf76
* commit '938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0
2016-05-11 19:13:46 +00:00
Sudheer Shanka
938501cf76
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
2016-05-11 19:04:20 +00:00
Jason Monk
b1e1e9a9fc
Merge "Fix unmount up button" into nyc-dev am: 7680871d92 am: 29b86d10d5
...
am: 60c6b9d252
* commit '60c6b9d252c6bab3a9a662c614a241784a9f616c':
Fix unmount up button
Change-Id: I91a6ace7eb4da5deb21c02c581bf96c8344041dc
2016-05-11 18:28:38 +00:00
Jason Monk
60c6b9d252
Merge "Fix unmount up button" into nyc-dev am: 7680871d92
...
am: 29b86d10d5
* commit '29b86d10d519a1a1620f42b83a0766246e286409':
Fix unmount up button
Change-Id: Ic666811fad5ed0b5512e9904d46158f61aee819a
2016-05-11 18:21:09 +00:00
Jason Monk
29b86d10d5
Merge "Fix unmount up button" into nyc-dev
...
am: 7680871d92
* commit '7680871d92cd9fa31a3f515d112767644745f26e':
Fix unmount up button
Change-Id: I4c803b0664abd85956b724b782820920dced6a31
2016-05-11 18:18:37 +00:00
Jason Monk
d88d281304
Merge "Fix unmount up button" into nyc-dev
...
am: 7680871d92
* commit '7680871d92cd9fa31a3f515d112767644745f26e':
Fix unmount up button
Change-Id: I5384e051aa9409b07af2a201f17244e91360003e
2016-05-11 18:15:38 +00:00
Jason Monk
7680871d92
Merge "Fix unmount up button" into nyc-dev
2016-05-11 18:04:57 +00:00
Jason Monk
0aed68d6b9
Fix unmount up button
...
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes: 28704198
2016-05-11 13:53:13 -04:00
Jason Monk
5df096c381
Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 3b533b98da
...
am: 779584976c
* commit '779584976c66e9836ea676c6b1a75ef43953920a':
Fix crash in not installed for this user apps
Change-Id: Ie4bd362867be447d5565d6084c8d638c6c11df29
2016-05-11 16:34:01 +00:00