Julia Reynolds
c265993528
Merge "Only show one copy of each preference" into oc-dev
...
am: 31de48193e
2017-05-04 20:15:12 +00:00
Julia Reynolds
31de48193e
Merge "Only show one copy of each preference" into oc-dev
2017-05-04 20:08:39 +00:00
Daniel Nishi
7d50d9db12
Merge "Fix a bug where override filter was always on." into oc-dev
...
am: 408fd90102
2017-05-04 17:30:41 +00:00
Esteban Talavera
895796aeb4
Merge "Show when work profile notifications are blocked for listener" into oc-dev
...
am: 607b4d0573
2017-05-04 17:30:18 +00:00
Daniel Nishi
408fd90102
Merge "Fix a bug where override filter was always on." into oc-dev
2017-05-04 17:18:37 +00:00
TreeHugger Robot
607b4d0573
Merge "Show when work profile notifications are blocked for listener" into oc-dev
2017-05-04 17:16:19 +00:00
Fan Zhang
d8b6244d82
Merge "Skip "null" string when building advanced button summary" into oc-dev
...
am: e4eb65c00e
2017-05-04 16:17:46 +00:00
Fan Zhang
e4eb65c00e
Merge "Skip "null" string when building advanced button summary" into oc-dev
2017-05-04 16:12:27 +00:00
Julia Reynolds
fc730aa947
Only show one copy of each preference
...
Fixes: 37912144
Fixes: 37909560
Test: manual, load app settings for legacy and upgrade apps from
inline settings, click (i), and click back.
Change-Id: Ieb96cca03f2596fd44cd33facafa3d4af1fbc24d
2017-05-04 10:10:22 -04:00
Esteban Talavera
2db8240b87
Show when work profile notifications are blocked for listener
...
Bug: 36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit ee349792dd
2017-05-04 11:41:06 +00:00
Fan Zhang
7ab82146c1
Merge "Fix string where it says "phone" on a tablet." into oc-dev
...
am: efed517a8a
2017-05-04 02:28:22 +00:00
TreeHugger Robot
efed517a8a
Merge "Fix string where it says "phone" on a tablet." into oc-dev
2017-05-04 02:23:18 +00:00
Lorenzo Colitti
fdd0f1e141
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
...
am: 33b0104cfc
2017-05-04 02:12:20 +00:00
Lorenzo Colitti
33b0104cfc
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
2017-05-04 02:06:50 +00:00
jackqdyulei
85950d5ebd
Merge "Update "Phone idle" subtext" into oc-dev
...
am: 3a1d6db0e7
2017-05-04 01:16:08 +00:00
Glen Kuhne
11853a75e3
Merge "Fix null pointer exception in wifi settings" into oc-dev
...
am: eb6eb99a56
2017-05-04 01:15:47 +00:00
TreeHugger Robot
3a1d6db0e7
Merge "Update "Phone idle" subtext" into oc-dev
2017-05-04 01:11:24 +00:00
TreeHugger Robot
eb6eb99a56
Merge "Fix null pointer exception in wifi settings" into oc-dev
2017-05-04 01:04:50 +00:00
Daniel Nishi
bf1f93698e
Fix a bug where override filter was always on.
...
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes: 37952170
Test: Settings unit test
2017-05-03 17:31:21 -07:00
Fan Zhang
91a03a9327
Fix string where it says "phone" on a tablet.
...
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix: 37833383
Test: visual
2017-05-03 17:03:55 -07:00
Jeremy Joslin
91dd31d722
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
...
am: b8eb78b321
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
2017-05-03 18:04:51 +00:00
Daniel Nishi
169fd4693f
Merge "Don't overly hide the Files preference." into oc-dev
...
am: 0c58fbd345
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
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
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
2017-05-02 17:48:41 +00:00
Miao Miao (苗苗)
b1480c8cab
Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
...
am: c6e3467cc2
2017-05-02 17:46:41 +00:00
Miao Miao (苗苗)
c6e3467cc2
Merge "Settings crash when receiving data state broadcast"
...
am: 2ed42d009b
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
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
2017-05-02 17:07:02 +00:00
Daniel Nishi
88c721116b
Merge "Tweak spacing for horizontal preferences." into oc-dev
...
am: b4937f4556
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
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
