Commit Graph

35884 Commits

Author SHA1 Message Date
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
Dan Sandler
d433f568f6 Defend against underspecified notifications.
While we're here, show the channelId and other O features of
notifications in the extra text.

(Also make a halfhearted attempt to keep an expanded
notification open while other notifications are updating.)

Bug: 37646836
Test: none
Change-Id: I1b34ae9aaeb0af1e9f993354cebef8644050bed2
2017-05-03 13:43:44 +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
Stephen Chen
f5d02aa765 Fix Disallow config Wi-Fi message for AFW Do mode.
Correctly displays the custom message set by the Test DPC tool
for devices in AFW Do mode.

This change also fixes an issue where when Wi-Fi is disabled, the
disabled message is not shown instantly on Settings app start.

Bug: 37134344
Bug: 37911257
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
for off message testing, manual inspection using the Test DPC tool, and
verifying Guest mode behavior.

Change-Id: I61e48f605d75cb5665461536beeedcb32f6aa7f9
2017-05-02 18:05:00 -07: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
Nathan Harold
01fc5e4ffc Update references to use PhoneConstantConversion
Bug: 33414487
Change-Id: I391671e38406235da48bddf61a70699974367e33
2017-05-02 13:44:27 -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
Miao Miao (苗苗)
d0cb54b27e Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2
am: b1480c8cab

Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
2017-05-02 17:48:41 +00:00
Miao Miao (苗苗)
b1480c8cab Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
am: c6e3467cc2

Change-Id: If6ad081e117a94df84d041776649af63c392cc30
2017-05-02 17:46:41 +00:00
Miao Miao (苗苗)
c6e3467cc2 Merge "Settings crash when receiving data state broadcast"
am: 2ed42d009b

Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
2017-05-02 17:44:08 +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
Treehugger Robot
2ed42d009b Merge "Settings crash when receiving data state broadcast" 2017-05-02 17:39:45 +00:00
Kevin Chyn
19323ca297 Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
am: f1f35ee107

Change-Id: I105ef25110a9c7b158c08f61f5e0b4354490218e
2017-05-02 17:16:09 +00:00
TreeHugger Robot
f1f35ee107 Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev 2017-05-02 17:12:22 +00: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
88c721116b Merge "Tweak spacing for horizontal preferences." into oc-dev
am: b4937f4556

Change-Id: Ida558c9499e49a1498e4469140dc099ef754e093
2017-05-02 17:06:36 +00:00
Daniel Nishi
a41a190ac3 Merge "Filter on volume for category storage view." into oc-dev 2017-05-02 17:03:36 +00:00
Daniel Nishi
b4937f4556 Merge "Tweak spacing for horizontal preferences." into oc-dev 2017-05-02 17:03:13 +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
The Android Open Source Project
ad5649043e Merge "Import translations. DO NOT MERGE" into oc-dev
am: 23550fdcd3  -s ours

Change-Id: I8a79bee09818497cf509369a673377bf623b1fb8
2017-05-02 15:59:49 +00:00
TreeHugger Robot
23550fdcd3 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-02 15:46:55 +00:00
The Android Open Source Project
e59cd40c54 Import translations. DO NOT MERGE
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
2017-05-02 02:06:19 -07:00
Kevin Chyn
5e6b804301 Revert "Swipe for notification should be default-on in settings app"
This reverts commit a95c2c3a8d.

Change-Id: I8fcc290be7d373d55058bd7c22f163d54fc03830
2017-05-02 06:49:17 +00:00
Kevin Chyn
f921f8e77e Merge "Swipe for notification should be default-on in settings app" into oc-dev
am: 9ab1318ca8

Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d
2017-05-02 04:14:47 +00:00
TreeHugger Robot
9ab1318ca8 Merge "Swipe for notification should be default-on in settings app" into oc-dev 2017-05-02 04:09:31 +00:00
Fan Zhang
403a4ee11a Merge "Update vpn icon from setting gear to vpn key." into oc-dev
am: 74327fa4f0

Change-Id: Ib711284c7071766d516d5b0e653f1b01da0f13bd
2017-05-02 02:28:10 +00:00
TreeHugger Robot
74327fa4f0 Merge "Update vpn icon from setting gear to vpn key." into oc-dev 2017-05-02 02:23:35 +00:00
Amit Mahajan
bd119a71ec Merge "Change to not call update() if APN is not modified." into oc-dev
am: 7cab6a9a17

Change-Id: I7ae69ec7797f10e0d48a4ce7d1b3a80c18851911
2017-05-02 02:07:38 +00:00
TreeHugger Robot
7cab6a9a17 Merge "Change to not call update() if APN is not modified." into oc-dev 2017-05-02 01:59:38 +00: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
Jaekyun Seok
33d77b09a6 Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a am: f8aaf9ecdc
am: 8b5389f707

Change-Id: Id42eb0a0ea330c5758e4a77a31158b7dd26256b5
2017-05-01 23:21:06 +00:00
Jaekyun Seok
8b5389f707 Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
am: f8aaf9ecdc

Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
2017-05-01 23:17:29 +00:00
Jaekyun Seok
f8aaf9ecdc Merge "Generate license html file from xml files of partitions"
am: 04a7e0a73a

Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
2017-05-01 23:15:34 +00:00
Treehugger Robot
04a7e0a73a Merge "Generate license html file from xml files of partitions" 2017-05-01 23:08:19 +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
Jaekyun Seok
fa0242c2e3 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
Merged-In: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
(cherry picked from commit 74812873f4)
2017-05-01 22:10:06 +00: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