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

28160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
7fdc663bf3 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25 am: 975d4245b3 
am: 02f1d04435

* commit '02f1d044356f9c2607afb0686e6bf5c5255b3237':

Change-Id: I97c60164b425480752bf16a4784624e0621b5b60
 2016-05-12 02:45:23 +00: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
0e3762af4c Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 am: c55d3e0ee8 
am: 909e713760

* commit '909e71376033ef48cc463d6a85d17ede78474661':

Change-Id: Ib63c5a8022a21ccd4fabfb404f6ddbeb9460a781
 2016-05-12 02:45:21 +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
02f1d04435 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev am: 3086911e25 
am: 975d4245b3

* commit '975d4245b3a88ccb6e58123f6db1e5898caf79df':

Change-Id: I9c1e09d86e7d023e26900ec9a8a0948b9dc5cff7
 2016-05-12 02:27:04 +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
909e713760 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 
am: c55d3e0ee8

* commit 'c55d3e0ee88dc8a062d9fae96b5a129c7936f220':

Change-Id: Iccc8edd8b5cefdfde26a907ec969328b3494f8ef
 2016-05-12 01:14:41 +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