Bartosz Fabianowski
74f5dc85b9
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
...
am: 9e94d80fa5
2017-06-08 05:55:40 +00:00
TreeHugger Robot
9e94d80fa5
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
2017-06-08 05:51:15 +00:00
jackqdyulei
6718f67018
Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2
...
am: 0d889079af
2017-06-08 02:18:23 +00:00
jackqdyulei
83bcc42e77
Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2
...
am: 33cb1408e2
2017-06-08 02:16:20 +00:00
jackqdyulei
0d889079af
Merge "Use default package in BatteryEntry" into oc-dev
...
am: f5f51c4cf2
2017-06-08 02:14:25 +00:00
jackqdyulei
33cb1408e2
Merge "Use default package in BatteryEntry" into oc-dev
...
am: f5f51c4cf2
2017-06-08 02:13:24 +00:00
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
Shinji Sogo
ba1b520505
Cleanup unused WifiP2pSettings code in WifiSettings
...
Cleanup commented code giving access to WifiP2pSettings from option menu
is not needed anymore.
Bug: 38333540
Test: Manual test
Change-Id: I5884ec219ba09601d9602f026fa8ad89f765934f
2017-06-07 22:55:24 +00:00
Matthew Fritze
d2f266bcfa
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e331f
...
am: 08bdbf3d5a
2017-06-07 20:54:55 +00:00
Matthew Fritze
ec0206efda
Merge "Hide Display Theme from search results when not available" into oc-dev am: 9f2f9e331f
...
am: 7868a7525b
2017-06-07 20:52:24 +00:00
Matthew Fritze
7868a7525b
Merge "Hide Display Theme from search results when not available" into oc-dev
...
am: 9f2f9e331f
2017-06-07 20:46:57 +00:00
Matthew Fritze
08bdbf3d5a
Merge "Hide Display Theme from search results when not available" into oc-dev
...
am: 9f2f9e331f
2017-06-07 20:46:56 +00:00
TreeHugger Robot
9f2f9e331f
Merge "Hide Display Theme from search results when not available" into oc-dev
2017-06-07 20:39:38 +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
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
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
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
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
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
2017-06-06 23:57:05 +00:00
William Luh
802f3e56d3
Merge "Make icons colorful for Security settings." into oc-dev
...
am: 9f7e705426
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
2017-06-06 22:40:32 +00:00
Lorenzo Colitti
1185ea72f2
Merge "Wifi details: minor ordering fixes." into oc-dev
...
am: 85395155fb
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
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
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
2017-06-06 19:28:41 +00:00
