jackqdyulei
b0490baa77
Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f
...
am: 424edd3064
2017-06-09 03:00:16 +00:00
jackqdyulei
424edd3064
Merge "Update subtitle for apps in battery settings" into oc-dev
...
am: 031b90541f
2017-06-09 02:57:46 +00:00
TreeHugger Robot
031b90541f
Merge "Update subtitle for apps in battery settings" into oc-dev
2017-06-09 02:53:36 +00:00
Matthew Fritze
d07e14fb5b
Merge "Search results always highlight proper results" into oc-dev
...
am: 2a32cb6a33
2017-06-09 01:23:39 +00:00
Matthew Fritze
824f25320a
Merge "Search results always highlight proper results" into oc-dev
...
am: 2a32cb6a33
2017-06-09 01:23:39 +00:00
TreeHugger Robot
2a32cb6a33
Merge "Search results always highlight proper results" into oc-dev
2017-06-09 01:19:38 +00:00
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
2017-06-09 00:19:04 +00:00
Daniel Nishi
60287a50e8
Merge "Update the music files icon." into oc-dev
...
am: 47c6afde7f
2017-06-09 00:19:03 +00:00
Matthew Fritze
33f3e3f4f7
Search results always highlight proper results
...
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.
This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.
Instead, we calculate index right before we highlight.
Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes: 62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
2017-06-08 16:25:52 -07:00
TreeHugger Robot
bf9cb113c1
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
2017-06-08 23:23:01 +00:00
jackqdyulei
dcea4e894e
Update subtitle for apps in battery settings
...
1. If it is a normal app, show "Screen usage TIME"
2. If it is a hidden app, show "TIME"
Note that in this case the item screen will show "TIME"
Bug: 62422404
Test: RunSettingsRoboTests
Change-Id: Ie8d6caf998d18994ac158f0217109c0e5e9f92ba
2017-06-08 12:52:48 -07: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
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
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
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
2017-06-07 00:11:08 +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
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
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
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
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
Matthew Fritze
6ab30cf253
Merge "Check for dynamic summaries at display time for search" into oc-dev am: 2046c59b77
...
am: 74eda7150b
2017-06-06 19:11:26 +00:00
Andrew Sapperstein
b5fb71acc6
Merge "Revert "Initial search bar implementation."" into oc-dev
...
am: dfc1983601
2017-06-06 19:10:43 +00:00
