Commit Graph

26355 Commits

Author SHA1 Message Date
Maurice Lam
1bc12ee9c2 Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
am: 102b368172

* commit '102b368172b4e8201b32efb686b3f3334e5ddbda':
  [ScreenLock] Use requested quality for encryption popup

Change-Id: I9373cd533e57006e71e9ea7df064f203994c7217
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
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
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
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
Maurice Lam
d0035fd621 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am: aead073d44

* commit 'aead073d4494c6b764cb384cdb96c79ec5a37aa5':
  Set Wi-Fi dialog spinners to 48dps tall

Change-Id: I130a82b74299ec5f358f6040e54974e4661e6dbb
2016-05-12 17:47:45 +00:00
Maurice Lam
aead073d44 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev 2016-05-12 17:42:19 +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
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
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
Maurice Lam
df055a4ac2 Set Wi-Fi dialog spinners to 48dps tall
Set the minimum height to align with the accessibility guidelines
and to disable ripple projection.

Also adds scroll indicators to the scroll view.

Bug: 28683023
Change-Id: I24c58c0d6e8ef4b9efc8b3f877bcd659f42b6c6d
2016-05-11 14:41:46 -07: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
Maurice Lam
8b649c0558 Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev 2016-05-11 20:05:18 +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
Maurice Lam
7b6791d126 Fix truncated text in pattern lock setup
Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.

Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.

Bug: 28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
2016-05-11 11:23:43 -07: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
Maurice Lam
ac97181cbc Merge "Fix truncated text in pattern lock setup" into nyc-dev
am: 353cdee69e  -s ours

* commit '353cdee69e492f4571025644009024e3a1b10898':
  Fix truncated text in pattern lock setup

Change-Id: I3fb29ac80ad857c15128b14076f0c2bf79375ea1
2016-05-11 18:18:19 +00:00
Jason Monk
7680871d92 Merge "Fix unmount up button" into nyc-dev 2016-05-11 18:04:57 +00:00
Maurice Lam
353cdee69e Merge "Fix truncated text in pattern lock setup" into nyc-dev 2016-05-11 18:04:26 +00:00
Jason Monk
0aed68d6b9 Fix unmount up button
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes: 28704198
2016-05-11 13:53:13 -04:00
Jason Monk
2134be3239 Merge "Fix crash in not installed for this user apps" into nyc-dev
am: a188b2447f

* commit 'a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
  Fix crash in not installed for this user apps

Change-Id: I177bc82e5d9848b9981a6ce0b1948094ae19d420
2016-05-11 16:28:48 +00:00
Jason Monk
a188b2447f Merge "Fix crash in not installed for this user apps" into nyc-dev 2016-05-11 16:19:04 +00:00
Jason Monk
bde1a7cfb1 Fix crash in not installed for this user apps
Change-Id: I96fa409c5a91cdb6758dbf81714c1c97e28f47b6
Fixes: 28637871
2016-05-11 11:33:04 -04:00
Jason Monk
b98fd15589 Merge "Expose dialog for current webview setting." into nyc-dev
am: f9e62e8d34

* commit 'f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
  Expose dialog for current webview setting.

Change-Id: Icc624a2ad85a3e119fa5a9893fa89d02e3773b51
2016-05-11 15:32:47 +00:00
Jason Monk
f9e62e8d34 Merge "Expose dialog for current webview setting." into nyc-dev 2016-05-11 15:27:37 +00:00
Jason Monk
7519954286 Expose dialog for current webview setting.
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes: 28554048
2016-05-11 11:20:55 -04:00
Jason Monk
f241ae5fcf Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev
am: 76f95e82b8

* commit '76f95e82b861441bccb9f452fe77e1c47acc1d3c':
  Protect against case when suggestions haven't loaded

Change-Id: Ie0bc3aa3e696efcec5560860284b457e636bd5bc
2016-05-11 15:16:01 +00:00
Jason Monk
76f95e82b8 Merge "Protect against case when suggestions haven't loaded" into nyc-dev 2016-05-11 15:06:05 +00:00
Jason Monk
31ecec0ab1 Protect against case when suggestions haven't loaded
Change-Id: I7668ed8af3f1808b619f0fdbd77c2f85da98f607
Fixes: 28691636
2016-05-11 11:01:17 -04:00
Victor Chang
38e54ae400 Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
am: e8c5eca02d

* commit 'e8c5eca02dab28c7c3860660c9cc8d890ee5a638':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: Ife7faac27689a9c364486930d1ecb5ed4cf741c0
2016-05-11 14:52:02 +00:00
Victor Chang
e8c5eca02d Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 2016-05-11 14:43:14 +00:00
Jason Monk
7b1c5657d5 Switch fragments to SettingsPreferenceFragment
am: 019aad4c61

* commit '019aad4c61da0b358782bc3cc59cc2688bb84a39':
  Switch fragments to SettingsPreferenceFragment

Change-Id: I15c83cbcda1a8936f8944addd4d6e65ef47415fe
2016-05-11 14:09:51 +00:00
Victor Chang
01f4dbcc1c Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
- Show ConfirmCredential in TrustedCredentialsSettings when Trust button is clicked
  for the very first time since the activity launched
- Warning activity (work mode off, crpyto-aware) should not be shown when the activity is started. Also fixed it here.

Bug: 28619980
Change-Id: I084b70883c087376e437a9ad3238d7c3313a0a17
2016-05-11 15:05:21 +01:00
Jason Monk
019aad4c61 Switch fragments to SettingsPreferenceFragment
So all basic settings features are supported properly

Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes: 28634520
2016-05-11 10:00:55 -04:00
Jason Monk
7cdfe9a6d8 Merge "Fix crash on rotate pointer speed" into nyc-dev
am: ab30931d41

* commit 'ab30931d4156afb8ee56c8df3b48fad4703712a7':
  Fix crash on rotate pointer speed

Change-Id: I6c73b33e8da5260240c7b6a549151da95c926164
2016-05-11 13:46:42 +00:00
Jason Monk
ab30931d41 Merge "Fix crash on rotate pointer speed" into nyc-dev 2016-05-11 13:36:53 +00:00
TreeHugger Robot
277b7a81bd Merge "Add list item to open tips & tricks." into nyc-mr1-dev 2016-05-10 20:31:09 +00:00
Jason Monk
6e9867dcc9 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
am: a50a14a23a

* commit 'a50a14a23a4f57203d01489ddef607f46f485518':
  Make sure TileAdapter always has a SuggestionParser

Change-Id: I87ee80fa989079c554c60870b9ddc70d3b36c5e4
2016-05-10 20:26:22 +00:00
Sudheer Shanka
a9cadaa52a Merge "Update the visibility state of views in UserPreference properly." into nyc-dev
am: a3b2bdc144

* commit 'a3b2bdc1442c807bfd0bb733221b04dd6eedf1fe':
  Update the visibility state of views in UserPreference properly.

Change-Id: I911765978cd757441ba8f6c2e9c83a61b2754ca4
2016-05-10 20:26:22 +00:00