Gustav Sennton
5aa4d7b67e
Merge "Don\'t show disabled packages in the WebView implementation Dev setting." into nyc-dev
...
am: b2e8d34359
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
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
Udam Saini
d553abcb4c
Moves the encryption interstitial to use the list layout
...
bug:27206957
Change-Id: Ib577440a2696539f44021bb4ba0100e9f1699c6c
2016-02-19 16:28:34 -08:00
Samuel Tan
688a34defe
WifiConfigController: set ca_path and ca_cert to null if unused am: d147f0090c
...
am: 18d9865388
2016-02-20 00:23:46 +00:00
Samuel Tan
18d9865388
WifiConfigController: set ca_path and ca_cert to null if unused
...
am: d147f0090c
2016-02-20 00:12:03 +00:00
Maurice Lam
059c0f6e84
Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev
...
am: 9a6aaebc74
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
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
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
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
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
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
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
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
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
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
2016-02-18 23:51:11 +00:00
Udam Saini
44387d8a62
Fixes talkback accessibility on learn more link.
...
Uses the LinkTextView, which handles partial url talkback
in textviews for accessibility. Also cleans up some string
spacing and changed an instance of Tap & hold to
Touch and hold for clarity.
bug:27171497
bug:26562712
Change-Id: I059a782a952ac962537c374959ee740962d6016f
2016-02-18 15:45:24 -08: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
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
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
86307ffd09
Round display scaling densities down to the nearest 2 DPI
...
am: 656143240c
2016-02-18 21:04:50 +00:00
Maria Garcia Puyol
c4b1a74806
Merge "Show emergency info preference for all users" into nyc-dev
...
am: adcec744b2
2016-02-18 21:04:38 +00:00
Jason Monk
f40b07becc
Merge "Make battery settings use new battery graph." into nyc-dev
...
am: fd267eb2ed
2016-02-18 21:04:28 +00:00
Jason Monk
41f69453a5
Merge "Fix date and time and apn editing" into nyc-dev
...
am: 91c2c96978
2016-02-18 21:04:17 +00: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
