Commit Graph

17574 Commits

Author SHA1 Message Date
TreeHugger Robot
73e03e6ca2 Merge "Update text for Languages & Input." into oc-dr1-dev 2017-06-09 01:09:25 +00:00
Daniel Nishi
f928324747 Merge "Update the music files icon." into oc-dev
am: 47c6afde7f

Change-Id: I20505a1958f7639ac91c571371a7555c4f9b9024
2017-06-09 00:19:04 +00:00
TreeHugger Robot
bf9cb113c1 Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev 2017-06-08 23:23:01 +00:00
Doris Ling
7e06ed2105 Update text for Languages & Input.
- update preference title to include gesture
- if assist gesture is supported, set summary text to reflect assist
status

Change-Id: I79477f331ae447d2505a1519da09886bf07ba1a2
Fix: 62219660
Test: make RunSettingsRoboTests
2017-06-08 12:19:10 -07:00
Lei Yu
377907ebad Merge "Add debug data in AnomalyLoader" into oc-dr1-dev 2017-06-08 17:59:34 +00:00
Daniel Nishi
e1571b8dac Update the music files icon.
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes: 62291640
Test: Manual
2017-06-08 10:24:14 -07:00
Alex Kulesza
c57ceaaa8c Implement general projection curve support for UsageGraph.
Previously, projections were hard-coded in UsageGraph as lines from the
last known point to the corner of the graph. This change replaces that
with support for arbitrary projection curves. Logic for hiding/showing
the projection is now gone; if the client does not want a projection,
it simply does not supply one.

There are two active clients of this code: the data usage graph and the
battery usage graph. The data graph does not use projections and is
essentially unchanged. The battery graph now implements its linear
extrapolation directly in BatteryInfo.

Bug: 38400320
Test: make SettingsUnitTests SettingsGoogleUnitTests
Test: manual (screenshots in comments)
Change-Id: I754e66f6b18ecb8b936143399f8e9e3368fc1ce4
2017-06-08 16:59:14 +00:00
jackqdyulei
0d889079af Merge "Use default package in BatteryEntry" into oc-dev
am: f5f51c4cf2

Change-Id: Ic97c8e2020f642cf7abba063e194796afe85bb58
2017-06-08 02:14:25 +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
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
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
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
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
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
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
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
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
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
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
Daniel Nishi
3be2832cfa Merge "Band aid to fix overly long text in donut." into oc-dev am: b5abb2c1d2
am: 0be5066922

Change-Id: Icf83d3412e0c87c5dbcb98156c0310a6db5b7645
2017-06-06 17:46:33 +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
Daniel Nishi
0be5066922 Merge "Band aid to fix overly long text in donut." into oc-dev
am: b5abb2c1d2

Change-Id: I8bd8b052cd8c437dd858a459c8098e39878b4b50
2017-06-06 17:40:04 +00:00
Daniel Nishi
b5abb2c1d2 Merge "Band aid to fix overly long text in donut." into oc-dev 2017-06-06 17:34:01 +00:00