Commit Graph

2375 Commits

Author SHA1 Message Date
TreeHugger Robot
f5f51c4cf2 Merge "Use default package in BatteryEntry" into oc-dev 2017-06-08 02:10:30 +00:00
jackqdyulei
c3694e425e Add debug data in AnomalyLoader
Bug: 62299540
Test: RunSettingsRoboTests
Change-Id: Id20db9fc0da8e090385caa982f2fb5a6fa0b2f38
(cherry picked from commit 5753e6d97e)
2017-06-08 00:12:43 +00:00
jackqdyulei
a64839b59d Use default package in BatteryEntry
Before this cl, we use the first package name if there is a name
list in BatterySipper.

We should use BatteryEntry.defaultPackageName instead, which could
describle the batterysipper more accurately.

Bug: 62417935
Test: RunSettingsRoboTests
Change-Id: I44fa151c0cf8f14cba305f179c7e94e5bc3ce434
2017-06-07 13:20:47 -07:00
Doris Ling
ec4064cdbd Update summary for Recent Apps.
Change the formatting of the time since last used to match the
formatting in battery info.

Change-Id: Ibd59493719d9f90391713713b75afd11790deaa0
Fix: 62273254
Test: make RunSettingsRoboTests
2017-06-07 11:22:10 -07:00
TreeHugger Robot
4d256e4080 Merge "Add saturation boost setting" 2017-06-07 02:36:12 +00:00
TreeHugger Robot
2814c29782 Merge "Update battery & storage settings to use headline font." 2017-06-07 02:08:57 +00:00
TreeHugger Robot
7276a61c93 Merge "Include home app when searching installed apps" 2017-06-07 01:17:49 +00:00
Romain Guy
305f900bfa Add saturation boost setting
Bug: 62238038 62377592 38225028
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=com.android.settings.display.ColorModePreferenceControllerTest
Change-Id: Iae8f4b25966ff28fde127e6103b2c03c67862cf0
2017-06-06 17:58:24 -07:00
Antony Sargent
e28dfea13b Set advanced battery usage items as non-selectable
The items in the ListView for the Advanced battery usage screen should
not ripple when touched, since these items don't do anything.

Bug: 38019330
Test: make RunSettingsRoboTests
Change-Id: I987a770f0f146b02bbf947238be7490e8a170feb
2017-06-06 17:12:17 -07:00
TreeHugger Robot
f702e39156 Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev 2017-06-06 23:52:49 +00:00
Andrew Sapperstein
dd19c3c8ba Update battery & storage settings to use headline font.
Updates several locations to use config_headlineFontFamily as the
android:fontFamily or Typeface object. This allows OEMs to specify
a custom headline font.

Bug: 36855735
Test: ag/2360364
Change-Id: I627515d2afd5ff018aae10843d099b8c83880635
2017-06-06 16:29:21 -07:00
Daniel Sheng
9cdd5d6ea2 Merge "Camera lift settings are now default-on." 2017-06-06 23:26:06 +00:00
Fan Zhang
0d8e1f23cb Include home app when searching installed apps
Change-Id: I4677307bb23f03ed7fb224c32312be7cb114763d
Fix: 62221174
Test: make RunSettingsRoboTests
2017-06-06 16:25:04 -07:00
TreeHugger Robot
62dded4453 Merge "Add logging to track search no-result case" 2017-06-06 23:03:57 +00:00
Lorenzo Colitti
60c5313ff5 Merge "Wifi details: minor ordering fixes." into oc-dev am: 85395155fb
am: 1185ea72f2

Change-Id: Id2661d1f4edac5d987f122542176372b2f99ef3b
2017-06-06 22:40:32 +00:00
Lorenzo Colitti
1185ea72f2 Merge "Wifi details: minor ordering fixes." into oc-dev
am: 85395155fb

Change-Id: Iae57ad27902d3dcb5406007ddc21bb03545bfcea
2017-06-06 22:35:42 +00:00
Lorenzo Colitti
85395155fb Merge "Wifi details: minor ordering fixes." into oc-dev 2017-06-06 22:24:43 +00:00
Daniel Sheng
dab739acce Camera lift settings are now default-on.
Bug: 62102062
Test: make RunSettingsRoboTests

Changing camera lift trigger setting to default-on.

Change-Id: Id4918ce3ecf82271989741cce54729e8fd49ae52
2017-06-06 14:19:24 -07:00
Fan Zhang
0ca782ab18 Add logging to track search no-result case
Change-Id: Iea95468c33e6663c0dad374954468947575bb3df
Fix: 37211659
Test: make RunSettingsRoboTests
2017-06-06 13:24:38 -07:00
Fan Zhang
4b525acee0 Merge "Fix master build" 2017-06-06 20:23:09 +00:00
Fan Zhang
71af32a218 Fix master build
Caused by bad merge from ag/2360433

Test: make RunSettingsRoboTests
Change-Id: I3fb55768686a6edc56dee60421c116dcf590239f
2017-06-06 13:22:35 -07:00
TreeHugger Robot
b424cf771b Merge "Refactor anomaly detection" 2017-06-06 19:44:19 +00:00
Matthew Fritze
6ab30cf253 Merge "Check for dynamic summaries at display time for search" into oc-dev am: 2046c59b77
am: 74eda7150b

Change-Id: Id496fc3d44f5103c65aa7b4de8ebcfab54f5de7b
2017-06-06 19:11:26 +00:00
Andrew Sapperstein
b5fb71acc6 Merge "Revert "Initial search bar implementation."" into oc-dev
am: dfc1983601

Change-Id: I6c143b18b53857accac23d7c64f807c6987609a5
2017-06-06 19:10:43 +00:00
TreeHugger Robot
dfc1983601 Merge "Revert "Initial search bar implementation."" into oc-dev 2017-06-06 19:04:26 +00:00
Matthew Fritze
74eda7150b Merge "Check for dynamic summaries at display time for search" into oc-dev
am: 2046c59b77

Change-Id: I549f1aa455ffbff0119dd00ef782710992100cce
2017-06-06 19:00:29 +00:00
Andrew Sapperstein
93adcee630 Merge "Revert "Add search bar to SearchActivity."" into oc-dev
am: 37f87b6c64

Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea
2017-06-06 19:00:04 +00:00
TreeHugger Robot
2046c59b77 Merge "Check for dynamic summaries at display time for search" into oc-dev 2017-06-06 18:52:31 +00:00
TreeHugger Robot
37f87b6c64 Merge "Revert "Add search bar to SearchActivity."" into oc-dev 2017-06-06 18:42:25 +00:00
Matthew Fritze
84ef9daa4f Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am: b8028f63ec
am: 64736b6ae1

Change-Id: I7267309d17ae503144eb11789888937af6c8a0e1
2017-06-06 18:13:41 +00:00
William Luh
5264b00d13 Use the standard place holder for the security summary. DO NOT MERGE
This removes the jitter when the cache is empty and there is
initially no summary, and then it is replaced by the fetched summary
when it's available.

Bug:36463348
Test: make RunSettingsRoboTests
Change-Id: I92cafbf23e3c562a470488dea28fd5106bbdf885
2017-06-06 11:00:49 -07:00
Matthew Fritze
64736b6ae1 Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
am: b8028f63ec

Change-Id: I47066c45b6ee286a2f1eac5ba1d57a5de058652c
2017-06-06 17:58:30 +00:00
TreeHugger Robot
b8028f63ec Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev 2017-06-06 17:44:23 +00:00
Andrew Sapperstein
a0e816d9d3 Revert "Initial search bar implementation."
This reverts commit 14934599dd.

Bug: 37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-06-06 17:30:17 +00:00
Andrew Sapperstein
61353aa4fd Revert "Add search bar to SearchActivity."
This reverts commit fac61b71e5.

Bug: 37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-06 17:29:41 +00:00
Matthew Fritze
ed761c4e74 Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
This reverts commit c1e9f8787f.

Reason for revert: There is an issue when dropdown menu text has a '%' sign in it.
Despite testing it on my own devices, the bug did not show up immediately.

Instead of continuing down this path for OC, we'll just revert
this patch, and then as an ugly, band-aid solution, check the
summary text for the "%s" substring, and hide it when found.
In O-DR onward, we'll look for a more permanent solution.

Change-Id: Ia7a04bfb7b09c436dc0f13564f2134a1f0c436e2
Bug: 36101902
Fix: 62211676
2017-06-06 17:20:30 +00:00
TreeHugger Robot
c3ff66e490 Merge "Prevent showing multiple keyguard dialog in vpn setup UI" 2017-06-06 17:17:06 +00:00
Matthew Fritze
0b4b716627 Check for dynamic summaries at display time for search
In order to hide dynamic summaries which use SettingPref,
we check if the summary is equal to "%s".

This is a temporary, band-aid fix which should be
changed in the next release.

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: I6cadb3ba68f09ba18ad9a6d2a817804c5d4a08e5
2017-06-06 08:34:16 -07:00
Lorenzo Colitti
acb76030de Merge changes I23540440,I67269e1a into oc-dev am: 4249a7092b
am: 844c385c09

Change-Id: I258837998e0c242d4c4dd4fb7c69da8049837173
2017-06-06 13:54:56 +00:00
Yohann Roussel
89fea15a84 resolve merge conflicts of 1104b94dbc to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I537fb871134f801ec9489b48fe748b525e5a65ea
2017-06-06 12:06:45 +00:00
TreeHugger Robot
e95b730c4f Merge "Ensure wifi ssid cannot exceed 32 bytes." 2017-06-06 06:33:49 +00:00
Lorenzo Colitti
088215d877 Wifi details: minor ordering fixes.
1. Set mNetwork before the NetworkCallbacks can be delivered.
   Previously, the code would set mNetwork in updateInfo, relying
   on the fact that the BroadcastReceiver registered in onResume
   is immediately invoked. However, this races with the
   callbacks, which are also immediately invoked. If the
   callbacks won the race, mNetwork would not be set and they
   would be ignored.

2. Call updateInfo in onResume instead of in displayPreference.
   This ensures that it's always called exactly once before the
   activity starts running, regardless of whether it's being
   displayed the first time (i.e., after onStart) or resumed
   by switching from another app. displayPreference is only
   called in the former case.

3. Don't call getLinkProperties and getNetworkCapabilities in
   updateInfo. These calls are superfluous, because this
   information is update by the NetworkCallbacks, and they can
   cause jank because updateInfo is called on the UI thread.

This requires that the tests be changed so they always call
onResume, since no UI elements are populated until onResume is
called.

Bug: 62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: Iccb1b9ae51188755d890a6df83004dbe9bec565e
2017-06-06 11:39:17 +09:00
jackqdyulei
e3e8bd6317 Refactor anomaly detection
This cl refactor it so:
1. AnomayLoader could create its own BatteryStatsHelper if needed.
2. AnomalyDetector could detect the anomaly with a target package name
3. Remove FeatureProvider in AnomalyLoader and use
AnomalyDetectionPolicy instead

With this cl, we could add anomaly detection to battery usage page
more easily.

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I1ee09701de8b5c8855f44e447813760285794c89
2017-06-05 19:35:22 -07:00
TreeHugger Robot
90ef8cea69 Merge "Add ability to see both battery estimates on long press" 2017-06-06 01:58:17 +00:00
TreeHugger Robot
5bf8d87454 Merge "Add a new Bluetooth device details page" 2017-06-06 01:28:54 +00:00
Lorenzo Colitti
844c385c09 Merge changes I23540440,I67269e1a into oc-dev
am: 4249a7092b

Change-Id: Ic8383cce733c5767b133af0e9f85e213e0c36018
2017-06-06 01:27:32 +00:00
Doris Ling
c6a282183b Remove call to WifiManager.setWifiApEnabled(). am: f38ed2fbb2
am: 802db8a844

Change-Id: If6e76b06e014d2c3e3eadf60c4bc2ff8e6a50607
2017-06-06 01:24:38 +00:00
Lorenzo Colitti
4249a7092b Merge changes I23540440,I67269e1a into oc-dev
* changes:
  When validation state changes, update the AP summary.
  Minor tweaks to WifiDetailPreferenceControllerTest.
2017-06-06 01:22:08 +00:00
Doris Ling
1104b94dbc Merge "Also update flip camera settings for managed profile." into oc-dev
am: 051a83d909

Change-Id: I4ba1750948815233ef6a963ddde1ca0bd33bcdec
2017-06-06 01:15:51 +00:00
Doris Ling
802db8a844 Remove call to WifiManager.setWifiApEnabled().
am: f38ed2fbb2

Change-Id: I255679d0eaeaa94d2ac6e5caddf4c6f5a5581bc1
2017-06-06 01:15:10 +00:00