PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,174 Commits 1 Branch 0 Tags
fd965b82bc35debfa38b7557bda0cb3431146f10
Commit Graph

28174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
fd965b82bc Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd am: 2c41dea8b3 
am: 1eb6b46304

* commit '1eb6b46304f26d5b8d5b956a8d9852e473bf4cae':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: Ic086a7d10107e7d752d41c3118ec3453047b1210
 2016-05-13 15:17:49 +00:00
Victor Chang
1eb6b46304 Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd 
am: 2c41dea8b3

* commit '2c41dea8b37a0289c3f07fbf7cbd5e682523b7a3':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I1e119d62cd1369cdd6365c9b3e06d299f30299e8
 2016-05-13 15:15:16 +00:00
Victor Chang
2c41dea8b3 Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev 
am: 19c7ef11bd

* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I3394d9eb0808f795b8dcce03578a0631731b2bee
 2016-05-13 15:12:50 +00:00
Victor Chang
19c7ef11bd Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev 2016-05-13 15:08:17 +00:00
Victor Chang
cba033e4b5 Fix NULL instead of DPC name is displayed in Certificate warning 
Bug: 28752118

Change-Id: I5a6e17efd92aaea5188d83f2ccb7e7b8d1f1dc1b
 2016-05-13 14:45:30 +01:00
Maurice Lam
b12079a7f1 Merge "Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172 am: 1bc12ee9c2" into nyc-mr1-dev-plus-aosp 
am: 544b4f9043

* commit '544b4f90436e8903dfd814194d7832002ecf88e1':

Change-Id: Ie4c6dec11436d92ee14dafff31dfd86818f56ce6
 2016-05-13 01:11:14 +00:00
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
Android Build Merger (Role)
544b4f9043 Merge "Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172 am: 1bc12ee9c2" into nyc-mr1-dev-plus-aosp 2016-05-13 01:02:23 +00:00
Maurice Lam
c89dafa84e Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172 
am: 1bc12ee9c2

* commit '1bc12ee9c25ea42c660d11244b8ff9a0c03ba3c0':
  [ScreenLock] Use requested quality for encryption popup

Change-Id: Ic93f54828b93bd167c73de8736b02345a45639e8
 2016-05-13 01:02:15 +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
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
c2030b0e1d Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a am: e7c67aae22 
am: a63fa6f4b7

* commit 'a63fa6f4b7cd3fc4b60742b7411c1f450d0a7840':

Change-Id: I1c53260022958c776cc90cd62858a9dbe9db2bc3
 2016-05-12 21:10:13 +00:00
Adrian Roos
a63fa6f4b7 Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a 
am: e7c67aae22

* commit 'e7c67aae2253dc67df10270f1edd5e33aca43714':

Change-Id: Ibb6f3795656ebf7a359350d8ac37b0d29ec15597
 2016-05-12 21:06:14 +00: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
79ffd34506 Merge "Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 am: d9dffc6080" into nyc-mr1-dev-plus-aosp 
am: 197dc19e57

* commit '197dc19e5747b894cfa21b1f21e6017c6064ffe4':

Change-Id: Ic0ab984f4c1d8303a9c338a6b53228163dd09573
 2016-05-12 18:01:09 +00: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
Android Build Merger (Role)
197dc19e57 Merge "Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 am: d9dffc6080" into nyc-mr1-dev-plus-aosp 2016-05-12 17:58:43 +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
d617e4257c Merge "Update lock timeout value after pref change." into nyc-dev am: 1590b8c005 
am: d9dffc6080

* commit 'd9dffc608099297fbadabc1f9f72659955de5707':
  Update lock timeout value after pref change.

Change-Id: I452876b5de56f10bd737bfe2f9b496420c82f369
 2016-05-12 17:58:29 +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
Maurice Lam
c854054a69 Merge "Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44 am: d0035fd621" into nyc-mr1-dev-plus-aosp 
am: 5ad66fcb3c

* commit '5ad66fcb3cbd16304608e92d2a7a2e78e45b50fe':

Change-Id: I38b087ada81d540809910fe55a12d56ae2d21912
 2016-05-12 17:53:24 +00:00
Maurice Lam
bbdd716bcf Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44 am: 3fdb526bbd 
am: 6de1c7e4f0

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

Change-Id: Id44ff3a5e49a70cf63a94c81d65a3b19f6b1b3d3
 2016-05-12 17:53:23 +00:00
Android Build Merger (Role)
5ad66fcb3c Merge "Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44 am: d0035fd621" into nyc-mr1-dev-plus-aosp 2016-05-12 17:51:02 +00:00
Maurice Lam
ab26eb2885 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44 
am: d0035fd621

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

Change-Id: I56ce3fa9a7b9b3e2ab4f5610bda75433635fa818
 2016-05-12 17:50:46 +00:00
Maurice Lam
6de1c7e4f0 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44 
am: 3fdb526bbd

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

Change-Id: Ib86a8883fd042f796fa83e9a9b341c94efea89a6
 2016-05-12 17:50:44 +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
3fdb526bbd 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: I66c985b54718ff2a6e66b54ba67d4ccae44a09c6
 2016-05-12 17:47:46 +00: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
46641b1d45 Merge "Merge "Disable WebViewSetting for non-admin users." into nyc-dev am: f76993a9da am: 6e9836845f" into nyc-mr1-dev-plus-aosp 
am: c602a41e8b

* commit 'c602a41e8bc23d1040ba2dc01e469638b0d771db':

Change-Id: I22dbff21eecf6d3bd4a2444e55143e6bf859c022
 2016-05-12 13:34:09 +00: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
Android Build Merger (Role)
c602a41e8b Merge "Merge "Disable WebViewSetting for non-admin users." into nyc-dev am: f76993a9da am: 6e9836845f" into nyc-mr1-dev-plus-aosp 2016-05-12 13:31:50 +00:00
Gustav Sennton
7a380f50d1 Merge "Disable WebViewSetting for non-admin users." into nyc-dev am: f76993a9da 
am: 6e9836845f

* commit '6e9836845f8193cd52590ebec402383f54a2a41e':
  Disable WebViewSetting for non-admin users.

Change-Id: If043c6dc2eda02303cf0d1276f0f2ba24c1d671b
 2016-05-12 13:31:40 +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