Commit Graph

25517 Commits

Author SHA1 Message Date
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
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

* 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
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

* commit '656143240c1e003cd39141c98548e7f0c625cc14':
  Round display scaling densities down to the nearest 2 DPI
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

* commit 'adcec744b2699a54db5606e9a50a08c6fb243a0e':
  Show emergency info preference for all users
2016-02-18 21:04:38 +00:00
Jason Monk
f40b07becc Merge "Make battery settings use new battery graph." into nyc-dev
am: fd267eb2ed

* commit 'fd267eb2ed842c29225a9ef0d7fcf45733263a99':
  Make battery settings use new battery graph.
2016-02-18 21:04:28 +00:00
Jason Monk
41f69453a5 Merge "Fix date and time and apn editing" into nyc-dev
am: 91c2c96978

* commit '91c2c96978fe9b5554a1ad16e26765e14cffca12':
  Fix date and time and apn editing
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
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
c26916458d 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
am: 4b67c1a8be

* commit '4b67c1a8be16f7a95759735ed4b714c72b308cac':
  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
2016-02-18 18:25:11 +00:00
Clara Bayarri
d9f2c849df Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
am: 42ed344f4b

* commit '42ed344f4bc4c1a39b08eb60b47ecffe38402860':
  Call reportFailedPasswordAttempt from Work Challenge
2016-02-18 18:24:59 +00: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
f7958ecfed 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
am: f040f80a77

* commit 'f040f80a7740798a25c6570b4446af8292f14226':
  Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001
2016-02-18 00:30:32 +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
b018eedae6 Merge "[Settings] Don\'t allow apps on external storage to be active admin" into nyc-dev
am: 4bd2152cbc

* commit '4bd2152cbcef0a73389a89d0d74643e044759087':
  [Settings] Don't allow apps on external storage to be active admin
2016-02-17 23:41:35 +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
be893c7f48 Merge "Fix inconsistent use of screenlock" into nyc-dev
am: 451ff8e916

* commit '451ff8e916b7a1ff9208bbf7f9330b9db633eac5':
  Fix inconsistent use of screenlock
2016-02-17 22:05:04 +00:00
Tony Mak
f891ba72c1 Merge "Home default setting should not shown in managed profile settings" into nyc-dev
am: 6e7cfdda79

* commit '6e7cfdda7975a737268f8a7281da5186d3ad2201':
  Home default setting should not shown in managed profile settings
2016-02-17 21:56:32 +00: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
Bill Yi
f55a8ddb4b Merge commit \'6a19c5cabf1615ffce654a1203554bbaa1d1f72e\' into HEAD
am: c9652c1d66  -s ours

* commit 'c9652c1d662b733519c8734bc51ee3a814081598':
2016-02-17 21:06:50 +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
aebb3338ea Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev
am: 2bf0f59048

* commit '2bf0f59048c82f99bfaafcfb0ff0f9a5ff0cd0e8':
  Create messenger preview screen for magnification gesture settings screen
2016-02-17 20:36:47 +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