Commit Graph

37068 Commits

Author SHA1 Message Date
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
Matthew Fritze
ac5956a5cf Hide Display Theme from search results when not available
Test: make RunSettingsRoboTests
Fixes: 62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
2017-06-07 16:21:44 +00:00
Bartosz Fabianowski
1e44c0e4b5 Add keys to all Preferences on the Managed device info page
In order to be able to hide the page from search results, all Preferences
(and PreferenceCategories) must have android:keys.

Bug: 62285529
Test: The Settings framework will have a test that ensure each Preference
Test: has a key from O-DR onward

Change-Id: I1e41ce6f8b9f90155ef92354b9268e9e720e1e73
2017-06-07 08:49:14 +02: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
William Luh
6c88ceed2f Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev am: f702e39156
am: 5a4603f5b3

Change-Id: Id6fccb0b75aafc2097b57f538dd9218067f30431
2017-06-07 00:11:33 +00:00
Alison Cichowlas
a90a144ef3 Merge "If two groups are posted to settings, remove old group and log." into oc-dev am: 9fa5e66a66
am: 59b4e5b6c4

Change-Id: I0661ae34df7dcca80b394e9751ce91dd2f5f25e1
2017-06-07 00:11:08 +00:00
William Luh
8f3b60dfb6 Merge "Make icons colorful for Security settings." into oc-dev am: 9f7e705426
am: 802f3e56d3

Change-Id: I4dec2d4211a57da31d0e3006945acd0588ee514c
2017-06-07 00:10:26 +00:00
William Luh
5a4603f5b3 Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
am: f702e39156

Change-Id: I3e45e09f609428bd7abe46629d68adf54c5b357b
2017-06-06 23:57:31 +00:00
Alison Cichowlas
59b4e5b6c4 Merge "If two groups are posted to settings, remove old group and log." into oc-dev
am: 9fa5e66a66

Change-Id: Iafb44eeb33fc626633ed885a2a18ed1cbe95ee48
2017-06-06 23:57:05 +00:00
William Luh
802f3e56d3 Merge "Make icons colorful for Security settings." into oc-dev
am: 9f7e705426

Change-Id: I397599ce60a3a334aae17ad77dfa94c4e7b24398
2017-06-06 23:56:36 +00: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
TreeHugger Robot
9fa5e66a66 Merge "If two groups are posted to settings, remove old group and log." into oc-dev 2017-06-06 23:34:44 +00:00
TreeHugger Robot
9f7e705426 Merge "Make icons colorful for Security settings." into oc-dev 2017-06-06 23:31:08 +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
William Luh
ac7aa59989 Make icons colorful for Security settings.
Bug:37997112
Test: make RunSettingsRoboTests
Change-Id: I287b5321cab0d4432fae61cf5565251180f37f5f
2017-06-06 14:05:10 -07:00
Alison Cichowlas
130a028f33 If two groups are posted to settings, remove old group and log.
Bug: 62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
2017-06-06 17:02:23 -04:00
Daniel Nishi
57d6778b75 Merge "Use the config default days to retain." 2017-06-06 20:37:41 +00: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
Hiroki Yamamoto
ea5e18c809 Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59 am: 77452b8a57
am: a1f5332068

Change-Id: If7351ccb7896cc1cfeb83837b09650a50ed1b55a
2017-06-06 19:47:06 +00:00
TreeHugger Robot
b424cf771b Merge "Refactor anomaly detection" 2017-06-06 19:44:19 +00:00
Hiroki Yamamoto
a1f5332068 Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041 am: 56a8267f59
am: 77452b8a57

Change-Id: I19237cb1f24dc1f0b127b2bd2476ee1f3a28b0bb
2017-06-06 19:34:49 +00:00
Hiroki Yamamoto
77452b8a57 Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041
am: 56a8267f59

Change-Id: Idca7ade0068f390289c7c13d1765fead6e0e1d35
2017-06-06 19:28:41 +00:00
Hiroki Yamamoto
56a8267f59 Merge "NFC: Reset Tap&pay summary text if default payment is not set"
am: e990bf3041

Change-Id: I2b2978a82a9dbee948b4e50f2b85978b9ddb58e5
2017-06-06 19:22:09 +00:00
Andrew Sapperstein
c7f31699ba Merge "Revert "Initial search bar implementation."" into oc-dev am: dfc1983601
am: b5fb71acc6  -s ours

Change-Id: Ifbfc8f7153fddc1f88b52f3475e17629034c20d8
2017-06-06 19:16:56 +00:00
Treehugger Robot
e990bf3041 Merge "NFC: Reset Tap&pay summary text if default payment is not set" 2017-06-06 19:12:55 +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
83e85cadd8 Merge "Revert "Add search bar to SearchActivity."" into oc-dev am: 37f87b6c64
am: 93adcee630  -s ours

Change-Id: I6871d37124fb138b50d486764f32af9b14bb5521
2017-06-06 19:11:03 +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