Commit Graph

25216 Commits

Author SHA1 Message Date
Jason Monk
60df76b169 Merge "Fix background data setting being backwords" into nyc-dev 2016-02-22 15:04:46 +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
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
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
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
9a6aaebc74 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev 2016-02-19 22:03:41 +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
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
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
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
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
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
ab1a97c307 Merge "add developer setting for multiprocess webview" into nyc-dev 2016-02-19 09:14:56 +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
672b51ba3b Track IWallpaperManager interface changes
Bug 25454162

Change-Id: I7ae64730ff485027462e3e96d32f7190f2d07dc8
2016-02-18 22:57:48 +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
656143240c Round display scaling densities down to the nearest 2 DPI
This will prevent scaling artifacts due to odd densities. We will not
make any adjustments to the "normal" density, which will preserve
tvdpi or whatever the device manufacturer needed to use.

Rounding the density down is always safe, since it will not push us
below our 320dp lower bound on minimum effective screen dimension.

Bug: 27225670
Change-Id: Ib084bb3d4fc70a59106ac74df5394c21e9f8c7bd
2016-02-18 15:56:25 -05:00
Maria Garcia Puyol
adcec744b2 Merge "Show emergency info preference for all users" into nyc-dev 2016-02-18 19:19:04 +00:00
Jason Monk
fd267eb2ed Merge "Make battery settings use new battery graph." into nyc-dev 2016-02-18 19:14:14 +00:00
Jason Monk
9cc88e5e5e Make battery settings use new battery graph.
Change-Id: I633a8750f9668c6315cd42866297ac3460375c22
2016-02-18 14:12:32 -05:00
Jason Monk
91c2c96978 Merge "Fix date and time and apn editing" into nyc-dev 2016-02-18 19:11:44 +00:00
mariagpuyol
fe19bc3d4b Show emergency info preference for all users
Change-Id: I8bfcedb8a15c9ca0194f5f526dd288857c19a1de
2016-02-18 10:27:41 -08:00
Anna Galusza
4b67c1a8be Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev 2016-02-18 17:53:34 +00:00
Clara Bayarri
42ed344f4b Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev 2016-02-18 11:16:27 +00:00
Anna Galusza
384fa2e342 Add Screen Zoom preview screen with settings page, launch Talkback tutorial
whenever the Talkback setting in SUW is pressed, and remove check for parent
Activity from SettingsPreferenceFragment.
Bug: 26734639

Change-Id: I5671735437844ac54ea68322838d9b6b5c81957f
2016-02-18 01:36:34 +00:00
Shweta Chahar
f040f80a77 Merge "Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001" into nyc-dev 2016-02-18 00:15:50 +00:00
Makoto Onuki
4bd2152cbc Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev 2016-02-17 22:48:43 +00:00
Jason Monk
d2e75e0528 Fix date and time and apn editing
Bug: 27219773
Bug: 25822074
Change-Id: Iec5d56846bf5d3a875180e8907529518949a0d7e
2016-02-17 17:28:46 -05:00
Makoto Onuki
9dbad57a84 [Settings] Don't allow apps on external storage to be active admin
Bug 27149287

Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8
2016-02-17 14:18:02 -08:00
Kenny Guy
451ff8e916 Merge "Fix inconsistent use of screenlock" into nyc-dev 2016-02-17 21:51:53 +00:00
Tony Mak
6e7cfdda79 Merge "Home default setting should not shown in managed profile settings" into nyc-dev 2016-02-17 21:43:02 +00:00
Tobias Sargeant
f8364f597b add developer setting for multiprocess webview
Change-Id: I9cd547ad4168b56b8b5c9eab9e2407daea74a30e
2016-02-17 21:07:54 +00:00
Kenny Guy
9de8c4625a Fix inconsistent use of screenlock
Change screenlock to screen lock
to be consistent.

Bug: 26635057
Change-Id: I4cb06cd2dcea0499a232ed3f28a7dbbf3598c9e9
2016-02-17 20:49:45 +00:00
Noah Wang
2bf0f59048 Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev 2016-02-17 20:20:01 +00:00
Julia Reynolds
ed5c50a9cb Delete Notification Topics.
Bug: 23220370
Change-Id: I072b68650af35ae3d5c5ccf6222dc31f5f36f9bb
2016-02-17 15:13:44 -05:00
Sudheer Shanka
bb7ba52837 Update strings related to policy transparency.
Bug: 25603665
Change-Id: I1eb46979fbb1e1562a165a9879ac0106ff689bd3
2016-02-17 20:10:01 +00:00
Tao Bao
28dfd93b14 Merge "Add a Developer option of "Disable automatic update"." into nyc-dev 2016-02-17 20:06:52 +00:00
Noah Wang
d51affa86a Create messenger preview screen for magnification gesture
settings screen

Change-Id: I4824c370388c4996e233c87005879d4818cfd59e
2016-02-17 12:02:04 -08:00
Tao Bao
45a2c163c3 Add a Developer option of "Disable automatic update".
For devices using A/B update or update-on-boot feature, we need a
Developer option to prevent the system updates from being installed
automatically.

We store the "disabled" status internally to turn on the automatic
update by default. But we show the opposite "enabled" status on screen
based on UX comments.

Bug: 27193001
Change-Id: I36a08a2a08fd1ba0f8f3c4b3ae5a08dc50829cd2
2016-02-17 10:41:24 -08:00