Commit Graph

37002 Commits

Author SHA1 Message Date
Daniel Nishi
60287a50e8 Merge "Update the music files icon." into oc-dev
am: 47c6afde7f

Change-Id: I78e6e1a16e25aff0e0374f5910fcbba0624f712b
2017-06-09 00:19:03 +00:00
TreeHugger Robot
47c6afde7f Merge "Update the music files icon." into oc-dev 2017-06-09 00:13:19 +00:00
Fan Zhang
7c7f234355 Use support feature provider to provide intro url.
Change-Id: I3d2493ec8c84fdc61c04fd63537f959fbd589e98
Fix: 62034077
Test: make RunSettingsRoboTests
2017-06-08 23:34:35 +00:00
Alex Kulesza
68be1736d3 Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
am: bf9cb113c1

Change-Id: I7dc6abaa4f9033492e848aa0977349e375991ec1
2017-06-08 23:28:28 +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
Daniel Nishi
0808bdc5da Add "Free up space" to the Settings search.
Change-Id: I8e987595adbd3c32de4001527a2a20478686d3e7
Fixes: 62167072
Test: Manual
2017-06-08 16:13:16 -07:00
Bill Yi
94e485819c Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours
am: 52c0cd702c  -s ours

Change-Id: I9b2a91a8a00da16ed51f3a2c36c8f7bc5eebe990
2017-06-08 22:55:00 +00:00
Bill Yi
a372e3c40e Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours
am: 7134ca433b  -s ours

Change-Id: Ieacc318862dce2ea16bcf451fd24a1f2a47b8a27
2017-06-08 22:53:09 +00:00
Bill Yi
52c0cd702c Import translations. DO NOT MERGE
am: 29a7bce4e5  -s ours

Change-Id: Iaec93787ba7a7e2eb885893842cea02932e16abe
2017-06-08 22:48:47 +00:00
Bill Yi
7134ca433b Import translations. DO NOT MERGE
am: 29a7bce4e5  -s ours

Change-Id: I436ea7a7e5a758581ed5b4e0c6aa0bc3773d702c
2017-06-08 22:46:57 +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
d16769a168 Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
am: 377907ebad

Change-Id: Ib201d8b7358c05017d8c22ad9a50233599ee123e
2017-06-08 18:05:05 +00: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
Bill Yi
29a7bce4e5 Import translations. DO NOT MERGE
Change-Id: I118bf54c3426f15db267545b83e9478177d13a06
Auto-generated-cl: translation import
2017-06-08 07:59:38 -07:00
Bartosz Fabianowski
9c105007c3 Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5
am: 74f5dc85b9

Change-Id: I36ba87aa3ee099575a11ed36409e505bb60a95b3
2017-06-08 06:27:55 +00:00
Bartosz Fabianowski
cb8242c21d Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5
am: 25f0d19504

Change-Id: I86e43483ea616ed0f4bc58fdcd8a1a0e0bab7097
2017-06-08 06:25:12 +00:00
Bartosz Fabianowski
25f0d19504 Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
am: 9e94d80fa5

Change-Id: I8056fc4d13f3e8528c1297ee3fe6f432ff7bc6dc
2017-06-08 06:13:42 +00:00
Bartosz Fabianowski
74f5dc85b9 Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
am: 9e94d80fa5

Change-Id: Ic9c510dac141664020567877d501da6289b633b4
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

Change-Id: Ib3311462c4e02249993351a52df9dffd6ef8ff7a
2017-06-08 02:18:23 +00:00
jackqdyulei
83bcc42e77 Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2
am: 33cb1408e2

Change-Id: I98d07e6a1194d71c9a2baaaf8ae08f159ff03a76
2017-06-08 02:16:20 +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
jackqdyulei
33cb1408e2 Merge "Use default package in BatteryEntry" into oc-dev
am: f5f51c4cf2

Change-Id: Ifd36cd50e2f4528dae247e99aafb5e93d916351e
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

Change-Id: Id756ce10347c9420274358b8b854c2d61bd5907b
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

Change-Id: Ia3b0ce129374c199f212707527639ee21b25bb5f
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

Change-Id: I478def41cfe2e639ec6d93ef9bbe2d79fda46142
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

Change-Id: Ie3fe1e8a7d2ac0c4045209403966dd80b7c4b5fa
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
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