PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,366 Commits 1 Branch 0 Tags
741e65fdff760392a845fcc4fe49a30266787b08
Commit Graph

25366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Tan
741e65fdff WifiConfigController: set ca_path and ca_cert to null if unused am: d147f0090c am: 18d9865388 
am: 688a34defe

* commit '688a34defeccef03cd19a402994bc622a3ce4200':
  WifiConfigController: set ca_path and ca_cert to null if unused
 2016-02-20 01:11:35 +00:00
Samuel Tan
688a34defe WifiConfigController: set ca_path and ca_cert to null if unused am: d147f0090c 
am: 18d9865388

* commit '18d98653883d4d28f8700588c3f4aad91f47411e':
  WifiConfigController: set ca_path and ca_cert to null if unused
 2016-02-20 00:23:46 +00:00
Samuel Tan
18d9865388 WifiConfigController: set ca_path and ca_cert to null if unused 
am: d147f0090c

* commit 'd147f0090ce28e1ad70f7a9b582dec91161139e8':
  WifiConfigController: set ca_path and ca_cert to null if unused
 2016-02-20 00:12:03 +00:00
Maurice Lam
e6e5031533 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev am: 9a6aaebc74 
am: 059c0f6e84

* commit '059c0f6e84c0c4223a145e69a28caa717b0e0be6':
  Revert "Revert "Use SetupWizardPreferenceLayout""
 2016-02-19 22:19:43 +00:00
Maurice Lam
059c0f6e84 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev 
am: 9a6aaebc74

* commit '9a6aaebc74f6e88eec2a220f01331d9e32ba9448':
  Revert "Revert "Use SetupWizardPreferenceLayout""
 2016-02-19 22:13:34 +00:00
Maurice Lam
9a6aaebc74 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev 2016-02-19 22:03:41 +00:00
Jason Monk
5f07334b38 Merge "Rename storage and usb to just storage" into nyc-dev am: 6348dac543 
am: 087624719b

* commit '087624719b3244e50a5891c30ba909c40b4406bd':
  Rename storage and usb to just storage
 2016-02-19 21:38:54 +00:00
Jason Monk
087624719b Merge "Rename storage and usb to just storage" into nyc-dev 
am: 6348dac543

* commit '6348dac5436f7d9aa2f54af7a2c077004870bee1':
  Rename storage and usb to just storage
 2016-02-19 21:33:51 +00:00
Jason Monk
6348dac543 Merge "Rename storage and usb to just storage" into nyc-dev 2016-02-19 21:26:00 +00:00
Sudheer Shanka
a9f39671ea Add disabled by policy empty views to more screens. am: 7dbbe13168 
am: dd2210f01c

* commit 'dd2210f01c58d5da7b222f9906af7142517e9019':
  Add disabled by policy empty views to more screens.
 2016-02-19 20:37:47 +00:00
Jason Monk
b918d97d5d Rename storage and usb to just storage 
Bug: 23840185
Change-Id: If0ea6be5a43b8aea1b49c46f3f95a92bef05aaf7
 2016-02-19 15:32:33 -05:00
Sudheer Shanka
dd2210f01c Add disabled by policy empty views to more screens. 
am: 7dbbe13168

* commit '7dbbe131683c231f6820bca4d67853649a4836f8':
  Add disabled by policy empty views to more screens.
 2016-02-19 20:30:02 +00:00
Sudheer Shanka
7dbbe13168 Add disabled by policy empty views to more screens. 
Bug: 27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32
 2016-02-19 20:18:43 +00:00
Sudheer Shanka
695c0b3055 Merge "Part3 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: 5d8e963c83 
am: 2c72056df2

* commit '2c72056df2830045dffa8c0969bc7aacc6b915ae':
  Part3 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:44:33 +00:00
Sudheer Shanka
429f959ef2 Merge "Part2 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: 1b59691855 
am: 0a685538fc

* commit '0a685538fc91c86f8b37f26ccea27743f58525b6':
  Part2 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:44:20 +00:00
Sudheer Shanka
2c72056df2 Merge "Part3 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev 
am: 5d8e963c83

* commit '5d8e963c83fd9198cb66e7fc745f9ff2a1919c44':
  Part3 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:39:21 +00:00
Sudheer Shanka
0a685538fc Merge "Part2 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev 
am: 1b59691855

* commit '1b596918554489e4c656d244ce1feed44b53b8a8':
  Part2 - Don't add padlock if the restriction is not set by admin.
 2016-02-19 19:39:05 +00:00
Julia Reynolds
2a18cc3a5f Merge "Delete Notification Topics." into nyc-dev am: 929c97e6ac 
am: 7c9b814d4a

* commit '7c9b814d4afdb340f6fd56b9c493d1731560b837':
  Delete Notification Topics.
 2016-02-19 19:34:39 +00:00
Sudheer Shanka
5d8e963c83 Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev 2016-02-19 19:31:45 +00:00
Sudheer Shanka
1b59691855 Merge "Part2 - Don't add padlock if the restriction is not set by admin." into nyc-dev 2016-02-19 19:31:45 +00:00
Julia Reynolds
7c9b814d4a Merge "Delete Notification Topics." into nyc-dev 
am: 929c97e6ac

* commit '929c97e6acf725df87456ad053ee47df47c921aa':
  Delete Notification Topics.
 2016-02-19 19:26:59 +00:00
Sudheer Shanka
29737ad910 Part2 - Don't add padlock if the restriction is not set by admin. 
Bug: 26687435
Change-Id: I85ef42e1ff1216791d1393a975e8559191b3781f
 2016-02-19 19:24:34 +00:00
Julia Reynolds
929c97e6ac Merge "Delete Notification Topics." into nyc-dev 2016-02-19 19:17:24 +00:00
Sudheer Shanka
34de47bd37 Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev am: 69c5f2a10f 
am: 305b6b8741

* commit '305b6b87410ed45bc1c88e0ee13e52da2d82b2a3':
  Update ShowAdminSupportDetailsDialog launchmode to singleTop.
 2016-02-19 19:08:33 +00:00
Sudheer Shanka
305b6b8741 Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev 
am: 69c5f2a10f

* commit '69c5f2a10f5ae522557f5a36982daa41da77a122':
  Update ShowAdminSupportDetailsDialog launchmode to singleTop.
 2016-02-19 19:03:28 +00:00
Sudheer Shanka
69c5f2a10f Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev 2016-02-19 18:57:21 +00:00
Samuel Tan
d147f0090c WifiConfigController: set ca_path and ca_cert to null if unused 
The WPA supplicant ca_cert and ca_path directives should not
both be non-null, since our EAP settings logic only allows one
or the other to be used.

Modify logic in getConfig() to explicitly set ca_path or ca_cert
to null if it is not used. This explicit null value is necessary
to override a previously non-null value saved in an existing
configuration.

Also, always set the domain_suffix_match directive, which
will lead to this directive to be reset when the Domain
field is hidden.

BUG: 27194668
TEST: 1) Install custom ca certificate onto device as "testcert"
TEST: 2) Configure an EAP-TLS network with CA certificate
         "testcert", Domain "testdomain",
         User certificate "Do not provide", identity empty, and save.
TEST: 3) Read network variables in data/misc/wifi/wpa_supplicant.conf
         and ensure that ca_cert is "testcert", ca_path is not
         present, and domain_suffix_match is "testdomain".
TEST: 4) Modify that same EAP-TLS network configured in step 2 with
         CA certificate "Use system certificates", Domain "testdomain",
         User certificate "Do not provide", identity empty, and save.
TEST: 5) Read network variables in data/misc/wifi/wpa_supplicant.eonf
         and ensure that ca_cert is "keystore://CACERT_testcert",
         ca_path is not present, and domain_suffix_match is
         "testdomain".
TEST: 6) Modify that same EAP-TLS network configured in step 2 to be
         an EAP-PWD network. Leave Identity and Password blank, and
         save.
TEST: 7) Read network variables in data/misc/wifi/wpa_supplicant.eonf
         and ensure that ca_cert, ca_path, and domain_suffix_match are
         not present.

Change-Id: I547f3e359bc8e9b77e51e10e60356b857230636f
 2016-02-19 09:01:21 -08:00
Sudheer Shanka
11408e96aa Merge "Update strings related to policy transparency." into nyc-dev am: 4e02a515d1 
am: 77759c2310

* commit '77759c2310c02d4e216c56f2e2ac8c6a2425b19a':
  Update strings related to policy transparency.
 2016-02-19 16:41:31 +00:00
Sudheer Shanka
77759c2310 Merge "Update strings related to policy transparency." into nyc-dev 
am: 4e02a515d1

* commit '4e02a515d1c75b75a4fa2d515174d9b50a7e64c8':
  Update strings related to policy transparency.
 2016-02-19 16:36:53 +00:00
Sudheer Shanka
4e02a515d1 Merge "Update strings related to policy transparency." into nyc-dev 2016-02-19 16:33:30 +00:00
Sudheer Shanka
fee4e3e405 Update ShowAdminSupportDetailsDialog launchmode to singleTop. 
Bug: 26977320
Change-Id: I8d89ba9243c807657fb4b2b8c93e75aab53d907e
 2016-02-19 11:47:53 +00:00
Toby Sargeant
a26ba55840 Merge "add developer setting for multiprocess webview" into nyc-dev am: ab1a97c307 
am: 02db2ff667

* commit '02db2ff66797272d38623e9467c45531cfe6529b':
  add developer setting for multiprocess webview
 2016-02-19 09:22:18 +00:00
Toby Sargeant
02db2ff667 Merge "add developer setting for multiprocess webview" into nyc-dev 
am: ab1a97c307

* commit 'ab1a97c30766b15a541a9bee35f853ffd8fefcca':
  add developer setting for multiprocess webview
 2016-02-19 09:18:27 +00:00
Toby Sargeant
ab1a97c307 Merge "add developer setting for multiprocess webview" into nyc-dev 2016-02-19 09:14:56 +00:00
Anna Galusza
e4937e435b Merge "Don\'t read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006" into nyc-dev am: 18f8712634 
am: f853239df4

* commit 'f853239df4f977060468def4d9b884e0adc359a5':
  Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006
 2016-02-18 23:58:06 +00:00
Anna Galusza
78b1d99c4f Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev am: 47f3115fbc 
am: 83d9b602be

* commit '83d9b602be08445e24bd03e1e4891ab7e406079d':
  Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583
 2016-02-18 23:57:48 +00:00
Anna Galusza
f853239df4 Merge "Don\'t read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006" into nyc-dev 
am: 18f8712634

* commit '18f87126341e4cef5da4514c57990f7fdf31ed04':
  Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006
 2016-02-18 23:51:26 +00:00
Anna Galusza
83d9b602be Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev 
am: 47f3115fbc

* commit '47f3115fbc7c22c6c5cd2188533ae7eafe1fa654':
  Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583
 2016-02-18 23:51:11 +00:00
Anna Galusza
18f8712634 Merge "Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006" into nyc-dev 2016-02-18 23:45:18 +00:00
Anna Galusza
47f3115fbc Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev 2016-02-18 23:45:00 +00:00
Christopher Tate
5d32e8cd59 Track IWallpaperManager interface changes am: 672b51ba3b 
am: e06bed2521

* commit 'e06bed2521c4effa06db328c1323fe48a8c799aa':
  Track IWallpaperManager interface changes
 2016-02-18 23:15:58 +00:00
Christopher Tate
e06bed2521 Track IWallpaperManager interface changes 
am: 672b51ba3b

* commit '672b51ba3bb0e8ae7c03af40d466c75ce0c9e1f0':
  Track IWallpaperManager interface changes
 2016-02-18 23:08:49 +00:00
Christopher Tate
672b51ba3b Track IWallpaperManager interface changes 
Bug 25454162

Change-Id: I7ae64730ff485027462e3e96d32f7190f2d07dc8
 2016-02-18 22:57:48 +00:00
Jeff Sharkey
97d06e071b Merge "Avoid division by zero in storage." into nyc-dev am: d1152d86cf 
am: 2e90897898

* commit '2e90897898c0ad1c166b41d80c512a3ba1bb81fc':
  Avoid division by zero in storage.
 2016-02-18 22:54:43 +00:00
Jeff Sharkey
2e90897898 Merge "Avoid division by zero in storage." into nyc-dev 
am: d1152d86cf

* commit 'd1152d86cff31fea37120c979e5f4e87ce43da0c':
  Avoid division by zero in storage.
 2016-02-18 22:48:17 +00:00
Jeff Sharkey
d1152d86cf Merge "Avoid division by zero in storage." into nyc-dev 2016-02-18 22:45:07 +00:00
Jeff Sharkey
d36e574cfa Avoid division by zero in storage. 
Bug: 26387833
Change-Id: I144475d4b82d91dcfd2271cd775e43d595914cef
 2016-02-18 15:43:54 -07:00
Anna Galusza
082d977653 Prevent Magnification video from being paused by the user and automatically 
pause the video on onPause and resume in onResume.
b/26984643
b/26705583

Change-Id: I7b805cf001ba3097fec4e7bd178588c3b23b455f
 2016-02-18 13:51:27 -08:00
Anna Galusza
e88a05601c Don't read state twice ("on on"/"off off") in Settings Toggle preferences. 
Bug: 26967006

Change-Id: I329aabc577ed8b3dc56fe86d9f7bc8f64461c2a0
 2016-02-18 13:29:35 -08:00
Alan Viverette
47d764cb34 Round display scaling densities down to the nearest 2 DPI am: 656143240c 
am: 86307ffd09

* commit '86307ffd09fb586c7a65c7bd26fe813803246937':
  Round display scaling densities down to the nearest 2 DPI
 2016-02-18 21:11:32 +00:00