Fan Zhang
69104921a9
Merge "Fix string where it says "phone" on a tablet." into oc-dev am: efed517a8a
...
am: 7ab82146c1
2017-05-04 02:30:53 +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
23671e84ba
Merge "Add a "sign into network" button to the wifi details page." into oc-dev am: 33b0104cfc
...
am: fdd0f1e141
2017-05-04 02:15:09 +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
Android Build Merger (Role)
b1726776c6
Merge "Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7 am: 85950d5ebd"
2017-05-04 01:28:52 +00:00
jackqdyulei
5c39601738
Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7
...
am: 85950d5ebd
2017-05-04 01:28:37 +00:00
Android Build Merger (Role)
6502eba7e0
Merge "Merge "Fix null pointer exception in wifi settings" into oc-dev am: eb6eb99a56 am: 11853a75e3"
2017-05-04 01:28:31 +00:00
TreeHugger Robot
6c4f768e0e
Merge "Add anomaly icon for PowerGaugePreference"
2017-05-04 01:28:21 +00:00
Glen Kuhne
f791573f95
Merge "Fix null pointer exception in wifi settings" into oc-dev am: eb6eb99a56
...
am: 11853a75e3
2017-05-04 01:28:07 +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
TreeHugger Robot
6643a399ba
Merge "Update ConvertToFbe fragment to use InstrumentedFragment"
2017-05-04 00:55:28 +00:00
TreeHugger Robot
9168d6d105
Merge "Add icon for anomaly preference"
2017-05-04 00:42:24 +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
jackqdyulei
f80eaf73d9
Add icon in PowerUsageAnomalyDetails
...
Also add icon size in AnomalyPreference so it won't be too large.
Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I124e99eba295d6600ffc73c05f73dd3c5c9de158
2017-05-03 17:02:18 -07:00
Jeremy Joslin
5231a159c7
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev am: b8eb78b321
...
am: 91dd31d722
2017-05-03 23:13:42 +00: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
jackqdyulei
4cb19e74b3
Add anomaly icon for PowerGaugePreference
...
When the app contains anomaly, we should show anomaly icon(triangle
alert).
This cl also extracts a new method refreshAppListGroup from refreshUi.
New method is used to only refresh appListGroup. Reason for this action:
1. Improve performance(partial refresh)
2. We init AnomalyLoader in refreshUi, invoke refreshUi in
onLoadFinish will create infinite loop.
Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: If54c89349e21763ca714123ac6ae884bd0f6a377
2017-05-03 16:01:55 -07:00
jackqdyulei
5dd9ad97d2
Add icon for anomaly preference
...
Bug: 36924669
Test: Screenshot
Change-Id: Ie0925504a36ec3778e793c1f2d9bc00f1163cf34
2017-05-03 15:57:51 -07: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
Fan Zhang
81682a42cf
Update ConvertToFbe fragment to use InstrumentedFragment
...
It doesn't need to use SettingsPrefFragment.
Change-Id: I3f99fdc15afe338081baf64d8387e6b53c473a48
Fix: 37765437
Test: visual
2017-05-03 22:53:45 +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
TreeHugger Robot
b45a9fe0a9
Merge "Add recent apps in app & notification"
2017-05-03 22:52:24 +00:00
jackqdyulei
995ca362c9
Update "Phone idle" subtext
...
Bug: 37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
2017-05-03 15:27:50 -07:00
TreeHugger Robot
a2f6a7c2e2
Merge "Add title and summary for "High usage" pref."
2017-05-03 22:20:11 +00: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
TreeHugger Robot
c43b09a22c
Merge "Fix a typo in the launch intent for emergency info."
2017-05-03 22:01:32 +00:00
fanzhang172
ae2f2b5268
Add recent apps in app & notification
...
- Introduce a RecentAppsPreferenceControler, which queries
UsageStatsManager and displays a list of recently used apps.
- Add a control flag for this feature, intially set to false.
- Make ManageApplications a static pref item instead of dynamic one.
This makes the RecentAppController easier to control "See all"
preference, which is backed by ManageApplications.
- Also adjust app_items.xml layout to make app item UI consistent with
preference item.
Change-Id: I0b9e1784faed32b3055ebf96ef98b6a5e422de50
Fix: 33265548
Test: robotests
2017-05-03 14:09:43 -07:00
Daniel Nishi
c90502627b
Merge "Always use GB as the unit in Storage Settings." into oc-dev am: 833927929e
...
am: f917c0aa24
2017-05-03 18:09:27 +00:00
Daniel Nishi
1ec0f84f43
Merge "Don't overly hide the Files preference." into oc-dev am: 0c58fbd345
...
am: 169fd4693f
2017-05-03 18:09:00 +00: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
jackqdyulei
59bc0cc7e7
Add title and summary for "High usage" pref.
...
The logic for this pref lives in AnomalyPreferenceController.
Bug: 36924669
Test: RunSettingsRoboTest
Change-Id: Ib88d8e76e1af8a2270fcb671baf55e9f6564b96e
2017-05-03 10:48:13 -07:00
Maurice Lam
14d24c998e
Merge "Include com.android.settings CodeInspectorTest"
2017-05-03 16:21:32 +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
Maurice Lam
b6da1d5b3f
Include com.android.settings CodeInspectorTest
...
Don't ignore classes directly under the package com.android.settings
in CodeInspectorTest.
Test: cd tests/robotests && mma
Change-Id: I4a6b00231839729405dd96a270e2dcbfef3b73c4
2017-05-02 22:12:09 -07:00
jackqdyulei
4dd126845b
Merge "Hide subtitle for wifi and bluetooth" into oc-dev am: 4b50e58a1d
...
am: 09adbd2f3b
2017-05-03 02:31:43 +00: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
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
Lei Yu
f368c6815c
Merge "Add abnormal app page for battery settings"
2017-05-03 00:49:35 +00:00
Lei Yu
f842fd941d
Merge "Add wakelock anomaly detector"
2017-05-03 00:48:58 +00:00
