PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,300 Commits 1 Branch 0 Tags
02736d1bf2fd53fa7804a88fa5b79aabd03f07dc
Commit Graph

25300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
02736d1bf2 Merge "Fix wallpaper prefs being too tall" into nyc-dev 
am: 3795d708ce

* commit '3795d708ce8a6898ef75f5e601f39b34840d80e8':
  Fix wallpaper prefs being too tall
 2016-02-22 20:29:16 +00:00
Jason Monk
3795d708ce Merge "Fix wallpaper prefs being too tall" into nyc-dev 2016-02-22 20:22:37 +00:00
Jason Monk
8d6350385d Fix wallpaper prefs being too tall 
Change-Id: Iddb45c77eb5014a596e9f94e3a2a9065165b2711
 2016-02-22 15:21:45 -05:00
Geoff Mendal
cf1a4b118c Import translations. DO NOT MERGE 
am: 0cb45a495e  -s ours

* commit '0cb45a495e0ea24bd03a4f95f076c130ce46c4f1':
  Import translations. DO NOT MERGE
 2016-02-22 16:26:40 +00:00
Julia Reynolds
5c34618128 Merge "Delete topics." into nyc-dev 
am: 778957cfac

* commit '778957cfaca203fffa7e7eb7f891b9661d50d216':
  Delete topics.
 2016-02-22 15:37:24 +00:00
Geoff Mendal
0cb45a495e Import translations. DO NOT MERGE 
Change-Id: I91a9aabb3a7378e68234fa42fb5ffdb999c8235e
Auto-generated-cl: translation import
 2016-02-22 07:32:39 -08:00
Julia Reynolds
778957cfac Merge "Delete topics." into nyc-dev 2016-02-22 15:23:45 +00:00
Julia Reynolds
fefcdbed42 Delete topics. 
Bug: 23220370
Change-Id: Ib1bc26183f00685b6547d5ffe37ce149c31fe153
 2016-02-22 10:20:01 -05:00
Jason Monk
ea174fd1c7 Merge "Fix background data setting being backwords" into nyc-dev 
am: 60df76b169

* commit '60df76b169c7d341130265a99a23bbfa63934f9c':
  Fix background data setting being backwords
 2016-02-22 15:11:52 +00:00
Jason Monk
60df76b169 Merge "Fix background data setting being backwords" into nyc-dev 2016-02-22 15:04:46 +00:00
Jason Monk
25f0ca889d Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev 
am: 4062c3932e

* commit '4062c3932e356ebd01ed64ecc1dc6d723f32857f':
  Convert data usage warning/limit to a edit text + dropdown
 2016-02-22 14:59:47 +00:00
Jason Monk
4062c3932e Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev 2016-02-22 14:57:51 +00:00
Gustav Sennton
5aa4d7b67e Merge "Don\'t show disabled packages in the WebView implementation Dev setting." into nyc-dev 
am: b2e8d34359

* commit 'b2e8d34359f8272f8214d16b09288505e2570d10':
  Don't show disabled packages in the WebView implementation Dev setting.
 2016-02-22 10:12:35 +00:00
Gustav Sennton
b2e8d34359 Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev 2016-02-22 10:10:13 +00:00
Jason Monk
bd5eabe12e Fix background data setting being backwords 
Bug: 27250166
Change-Id: Ia8ef4b0ab860e6c15d972a32c7918b2d54f7743b
 2016-02-21 11:53:36 -05:00
Jason Monk
e4897d939b Convert data usage warning/limit to a edit text + dropdown 
Now choose between MB and GB, then type in the number for the limit.

Bug: 27238018
Change-Id: I049be2be3ded52a9ed87e57348ed87b82dbb819c
 2016-02-21 11:39:42 -05:00
Jason Monk
f6d69edaf5 Add generic logging to Settings switch bar 
am: e4ebcd12be

* commit 'e4ebcd12be7baae58a1fabcda6c7544c911c95eb':
  Add generic logging to Settings switch bar
 2016-02-21 14:41:36 +00:00
Jason Monk
e4ebcd12be Add generic logging to Settings switch bar 
Same usage/format as the shared preference logging.

Bug: 27043208
Change-Id: I7a7a5c0a9c92ec6cef50df58313016218cf2f2f7
 2016-02-21 09:37:41 -05: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
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
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
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
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
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
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
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
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
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
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
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