Commit Graph

1607 Commits

Author SHA1 Message Date
Jeremy Joslin
91dd31d722 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
am: b8eb78b321

Change-Id: I0be3efe4d409910fb8be30a3e667648d87d0975a
2017-05-03 23:05:59 +00:00
TreeHugger Robot
b8eb78b321 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev 2017-05-03 22:57:16 +00:00
Glen Kuhne
3c5bd235f3 Fix null pointer exception in wifi settings
Fixes a null pointer exception that can occur during setup wizard.

Bug: 37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
2017-05-03 15:53:16 -07:00
jackqdyulei
995ca362c9 Update "Phone idle" subtext
Bug: 37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
2017-05-03 15:27:50 -07:00
Fan Zhang
540023608d Skip "null" string when building advanced button summary
- Also added help string to SoundSettings as a side fix.

Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix: 37933524
Test: robotests
2017-05-03 15:05:22 -07:00
Daniel Nishi
f917c0aa24 Merge "Always use GB as the unit in Storage Settings." into oc-dev
am: 833927929e

Change-Id: I569b89bcf10fa32f86978c80fb646c0d4503b89e
2017-05-03 18:04:51 +00:00
Daniel Nishi
169fd4693f Merge "Don't overly hide the Files preference." into oc-dev
am: 0c58fbd345

Change-Id: I4dbc750366d9fdbd6bc18abd751e47694de1d368
2017-05-03 18:04:17 +00:00
Daniel Nishi
833927929e Merge "Always use GB as the unit in Storage Settings." into oc-dev 2017-05-03 18:00:19 +00:00
Daniel Nishi
0c58fbd345 Merge "Don't overly hide the Files preference." into oc-dev 2017-05-03 17:59:08 +00:00
Lorenzo Colitti
b6245156f6 Add a "sign into network" button to the wifi details page.
Bug: 36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364
2017-05-03 22:14:08 +09:00
jackqdyulei
09adbd2f3b Merge "Hide subtitle for wifi and bluetooth" into oc-dev
am: 4b50e58a1d

Change-Id: I2997ffe57474de973a66932b685fbbaf9bf77955
2017-05-03 02:24:48 +00:00
TreeHugger Robot
4b50e58a1d Merge "Hide subtitle for wifi and bluetooth" into oc-dev 2017-05-03 02:18:53 +00:00
Daniel Nishi
f7fa542eb6 Don't overly hide the Files preference.
This occurred this because the files preference was initialized during
displayPreference(), but the volume used to initialize it was not being
set until after the displayPreference() call. In this case, the files
preference would hide itself and never come back.

This fixes this by double-checking the Files visibility status whenever
we set the volume.

Change-Id: I0b1a7a9566e9caece39ec58706fbca034ef4c1c2
Fixes: 37790776
Test: Settings robotest
2017-05-02 15:42:55 -07:00
jackqdyulei
f68fbce16e Hide subtitle for wifi and bluetooth
Hide it for now because the usage time is not accurate. We may
revisit it in the future.

Bug: 37912143
Test: RunSettingsRoboTests
Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae
2017-05-02 15:16:19 -07:00
Matthew Fritze
68824ba600 Merge "Prevent empty non-Indexable keys from being added" into oc-dev
am: d51b94b042

Change-Id: I2b915166c5a52082bfb0c4dff52ea9101f5c2514
2017-05-02 19:29:18 +00:00
TreeHugger Robot
d51b94b042 Merge "Prevent empty non-Indexable keys from being added" into oc-dev 2017-05-02 19:25:53 +00:00
Matthew Fritze
4f198813ed Prevent empty non-Indexable keys from being added
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes: 37646265
Test: make RunSettingsRoboTests
2017-05-02 10:42:07 -07:00
Daniel Nishi
854acc9e4b Merge "Filter on volume for category storage view." into oc-dev
am: a41a190ac3

Change-Id: I967f4fd28c5375f0c56ad88dedc47a484918b629
2017-05-02 17:07:02 +00:00
Daniel Nishi
a41a190ac3 Merge "Filter on volume for category storage view." into oc-dev 2017-05-02 17:03:36 +00:00
Jeremy Joslin
9dd363847c Allow "None" to be selected as a Network rating provider.
Updated the picker to always provide "None" as an option. The
preference is only disabled if there a no valid scorers installed.
Existing tests updated and new tests added.

Bug: 37722313
Test: make RunSettingsRoboTests -j40
Test: manual on device clicking.
Change-Id: Ie6fd9f29e0ea3c64845dd98ce1d117013f50c86b
2017-05-02 09:12:48 -07:00
Jaekyun Seok
4a6781af1b Merge "Do not show static overlays as a theme" into oc-dev
am: 170acdb79b

Change-Id: I7172c65c195baa356dc6f2dbe1d9793dca51b3fa
2017-05-02 01:15:01 +00:00
TreeHugger Robot
170acdb79b Merge "Do not show static overlays as a theme" into oc-dev 2017-05-02 01:03:54 +00:00
Jesse Evans
34e0c7afdf Merge "Hides app buttons for instant apps" into oc-dev
am: 965508fc3e

Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d
2017-05-02 00:34:02 +00:00
TreeHugger Robot
965508fc3e Merge "Hides app buttons for instant apps" into oc-dev 2017-05-02 00:29:00 +00:00
Daniel Nishi
5aeb6c4fab Filter on volume for category storage view.
The other storage view used a compound filter with a UUID filter and the
normal filter. The category filters were omitting the compound UUID
filter. This adds it.

Test: Settings unit test
Change-Id: Ic0118abf58dabbf430a81e1fbcefb7acfdef472c
Fixes: 37780836
2017-05-01 15:42:50 -07:00
Daniel Nishi
e25371e8bc Merge "Make the storage free/total sizes consistent." into oc-dev
am: b22c11ae28

Change-Id: Ibee39375f0c714f5ff7578c24f78a387cd54bc44
2017-05-01 21:46:50 +00:00
Daniel Nishi
b22c11ae28 Merge "Make the storage free/total sizes consistent." into oc-dev 2017-05-01 21:40:23 +00:00
Jaekyun Seok
d3d3310ee2 Merge "Generate license html file from xml files of partitions" into oc-dev
am: 7f59081421

Change-Id: Ia027639c81093af0defff40f2e85ddb499093652
2017-05-01 21:27:01 +00:00
TreeHugger Robot
7f59081421 Merge "Generate license html file from xml files of partitions" into oc-dev 2017-05-01 21:22:19 +00:00
Jaekyun Seok
ef85d880a5 Do not show static overlays as a theme
Static overlays aren't changeable by a user. So we shouldn't list them
as a theme.

This CL fixed b/36812704 as well to run unit tests.

Test: building succeeded and tested on sailfish.
      make RunSettingsRoboTests
      adb shell am instrument -w -e class \
          com.android.settings.display.ThemePreferenceControllerTest \
          com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Bug: 37480890
Bug: 36812704

Change-Id: I8c13b6956083095dceaab3da6642bef1647d6a30
2017-05-02 06:18:48 +09:00
Jesse Evans
0d7854aa43 Hides app buttons for instant apps
Hides the app buttons when the app is an instant app.

Added a todo to remove this functionality when instant apps
are properly supported by this controller.

Test: make RunSettingsRoboTests
Bug: 37313605
Change-Id: I3fca106a8e72c41b626e1182f5ba1089b90e8e2a
2017-05-01 11:12:52 -07:00
TreeHugger Robot
0ee4e7df8e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-29 17:59:43 +00:00
TreeHugger Robot
b50460086d Merge "Don't hide network reset even if it's disabled by admin." into oc-dev 2017-04-29 06:53:27 +00:00
TreeHugger Robot
908cad27ab Merge "Add emergency broadcast to app & notification settings." into oc-dev 2017-04-29 06:53:12 +00:00
Bill Yi
27dc0b5efa Import translations. DO NOT MERGE
Change-Id: I0ae57f3a1b494044e26518590797977fa331a975
Auto-generated-cl: translation import
2017-04-28 19:46:17 -07:00
Jaekyun Seok
74812873f4 Generate license html file from xml files of partitions
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.

Test: building succeeded and tested on sailfish.
  make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
  make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
  make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug: 37099941
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
2017-04-29 09:47:24 +09:00
TreeHugger Robot
30e9474dbb Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev 2017-04-28 23:08:20 +00:00
Fan Zhang
d53c6d57f3 Add emergency broadcast to app & notification settings.
Also fixed a bug where progressive disclosure expand button is displayed
incorrectly when # of preference == threshold exactly.

Change-Id: I518687e374853ae8ab1c7e5337822492d6fd99ff
Fix: 36557600
Test: robotests
2017-04-28 14:36:17 -07:00
Fan Zhang
293556d6b8 Revert "Display and parse numbers properly in all locales"
Bug: 37311645

This reverts commit 8648c5ed3d.

Change-Id: If26d07a59dd9e71813a2b48f3bee25516bfb0b75
2017-04-28 21:06:28 +00:00
TreeHugger Robot
10158feecf Merge "Add content description to the master switch toggle button." into oc-dev 2017-04-28 19:24:11 +00:00
Fan Zhang
cf96674977 Don't hide network reset even if it's disabled by admin.
Change-Id: Ib78a3c9434c8543f3be34932264802f1065cc54b
Fix: 37134598
Test: robotests
2017-04-28 18:06:16 +00:00
Fan Zhang
4f4fe03a6e Merge "Merge pointer/tts categories into one without heading" into oc-dev 2017-04-27 23:34:00 +00:00
TreeHugger Robot
646d996865 Merge "Add summary for Backup menu in Settings." into oc-dev 2017-04-27 23:20:29 +00:00
TreeHugger Robot
64857437a4 Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev 2017-04-27 23:08:20 +00:00
TreeHugger Robot
02619a6d9f Merge "Add summary to special app access." into oc-dev 2017-04-27 22:31:48 +00:00
Doris Ling
e2ad415fdb Add content description to the master switch toggle button.
Set the preference title as the toggle button's content description, so
that when user focus on the button, it will read the lable as well on
top of just "switch on" or "switch off".

Change-Id: Id1954fd54b7d38cb4e75d8b3e49d05ee694e0e41
Fix: 37618855
Test: make RunSettingsRoboTests
2017-04-27 15:09:21 -07:00
Anton Philippov
ca5e1bd67b Add summary for Backup menu in Settings.
'On'/'Off' depending on whether the backup is enabled in settings.

Refactors BackupSettingsActivity to be shown on System fragment via
xml/PreferenceController instead of category in the manifest.

Bug: 36891827
Test: make RunSettingsRoboTests
Change-Id: I61425fed4d63055c6c386be38792ae074aa72679
2017-04-27 22:33:52 +01:00
Fan Zhang
496fd0ca34 Merge pointer/tts categories into one without heading
Change-Id: I75dd6472a6eb4929773222844872d43027122f3c
Fix: 35960300
Test: robotests
2017-04-27 13:47:44 -07:00
Sudheer Shanka
f64c5236c7 Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev 2017-04-27 20:46:16 +00:00
TreeHugger Robot
b48e6e46b3 Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev 2017-04-27 19:50:31 +00:00