Commit Graph

18373 Commits

Author SHA1 Message Date
Daniel Nishi
82facf0ca8 Merge "Add "Free up space" to the Settings search." into oc-dr1-dev am: 1dc3f38506
am: d60511d6ca

Change-Id: Ic688f627e055fca2e461d394625c1ade1a6ca06c
2017-06-09 18:20:19 +00:00
Daniel Nishi
1dc3f38506 Merge "Add "Free up space" to the Settings search." into oc-dr1-dev 2017-06-09 17:56:51 +00:00
Antony Sargent
96b40a284f Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60 am: 6a5f36a494
am: e20b2ea043

Change-Id: I0c081383954104ab3d22439dffb3a6aefd6efe3a
2017-06-09 16:06:09 +00:00
Antony Sargent
92661526d4 Merge "Set advanced battery usage items as non-selectable" into oc-dev
am: d77b699e60

Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
2017-06-09 15:49:11 +00:00
Antony Sargent
6a5f36a494 Merge "Set advanced battery usage items as non-selectable" into oc-dev
am: d77b699e60

Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13
2017-06-09 15:49:10 +00:00
Antony Sargent
d77b699e60 Merge "Set advanced battery usage items as non-selectable" into oc-dev 2017-06-09 15:41:27 +00:00
Hugo Benichi
5d02b8b85f Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev 2017-06-09 08:56:19 +00:00
jackqdyulei
3aae1f336e Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am: 4f02eebab8

Change-Id: Id02583309a3e547855b7ffc69e065c2293fb172e
2017-06-09 08:34:46 +00:00
TreeHugger Robot
4f02eebab8 Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev 2017-06-09 08:29:57 +00:00
jackqdyulei
6a9c5edc98 Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev am: 4c4e780577
am: 3f3e44114e

Change-Id: I2494d08a3a40a23c5f71eacde8733d98dc0510ac
2017-06-09 04:57:22 +00:00
jackqdyulei
82fcadad65 Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings

Handle it in onCreate() and onSaveInstanceState()

Bug: 62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Merged-In: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
2017-06-08 21:49:15 -07:00
TreeHugger Robot
4c4e780577 Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev 2017-06-09 04:39:41 +00:00
Fan Zhang
2cc1669ed3 Merge "Merge "Use support feature provider to provide intro url." into oc-dr1-dev am: bdc0816982" into oc-dr1-dev-plus-aosp
am: afa34b1cc4

Change-Id: Iac1d851fb89ea51827bca764004ff3741f54dd14
2017-06-09 03:03:14 +00:00
jackqdyulei
1ba91b2568 Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f am: 424edd3064
am: b0490baa77

Change-Id: I07e2f7c98bdd73703d6c8b153491cbf5bc9d01f6
2017-06-09 03:02:45 +00:00
Android Build Merger (Role)
afa34b1cc4 Merge "Merge "Use support feature provider to provide intro url." into oc-dr1-dev am: bdc0816982" into oc-dr1-dev-plus-aosp 2017-06-09 03:00:46 +00:00
jackqdyulei
b0490baa77 Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f
am: 424edd3064

Change-Id: I36aba85cd1deb78fef15092996e6cc1b364dd79f
2017-06-09 03:00:16 +00:00
jackqdyulei
424edd3064 Merge "Update subtitle for apps in battery settings" into oc-dev
am: 031b90541f

Change-Id: I7ec1ee37eb42d5523502ae3a17694f61ea6197ba
2017-06-09 02:57:46 +00:00
jackqdyulei
6525053801 Merge "Update subtitle for apps in battery settings" into oc-dev
am: 031b90541f

Change-Id: Ia0581b295824b73ef36f931066b883cff51fc0e9
2017-06-09 02:57:46 +00:00
TreeHugger Robot
bdc0816982 Merge "Use support feature provider to provide intro url." into oc-dr1-dev 2017-06-09 02:54:32 +00:00
TreeHugger Robot
031b90541f Merge "Update subtitle for apps in battery settings" into oc-dev 2017-06-09 02:53:36 +00:00
Hugo Benichi
2c06009ad6 Instrument sign-in-captive-portal button
Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: WifiDetailPreferenceControllerTest updated
Change-Id: I03dbcdd6efbd0d7aaf2ef67d541fceeb6acc2acf
(cherry picked from commit 539211a718)
2017-06-09 02:51:46 +00:00
Hugo Benichi
391f3fa30d Merge "Instrument sign-in-captive-portal button" 2017-06-09 02:42:26 +00:00
jackqdyulei
f9a5c39c4c Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings

Handle it in onCreate() and onSaveInstanceState()

Bug: 62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
2017-06-08 19:20:05 -07:00
Matthew Fritze
812ad7b329 Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33 am: 824f25320a
am: 0514c19273

Change-Id: Ia9baa982a544d126bd175c0112f240aa73412857
2017-06-09 01:28:48 +00:00
Matthew Fritze
d07e14fb5b Merge "Search results always highlight proper results" into oc-dev
am: 2a32cb6a33

Change-Id: I649a4122952a41b31ee66b0daab8607b683d3e19
2017-06-09 01:23:39 +00:00
Matthew Fritze
824f25320a Merge "Search results always highlight proper results" into oc-dev
am: 2a32cb6a33

Change-Id: I1bc6297cc75aa833184a00598f5930aa3ca114dc
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
Doris Ling
24ab7be89f Merge "Update text for Languages & Input." into oc-dr1-dev am: 73e03e6ca2
am: 94fa9d8f6e

Change-Id: I7ae8afa33248302f55126cbc6d4f0e89a7f41eee
2017-06-09 01:15:38 +00:00
TreeHugger Robot
cfda7bf224 Merge "Increase visibilities in SearchFragment and SearchResutlsAdapter for testing" 2017-06-09 01:10:48 +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

Change-Id: I20505a1958f7639ac91c571371a7555c4f9b9024
2017-06-09 00:19:04 +00:00
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
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
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
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
Soroosh Mariooryad
9aad1cd48b Increase visibilities in SearchFragment and SearchResutlsAdapter for testing
Test: RunSettingsRoboTests
Bug: 36867802

Change-Id: I9102d02a5500330ce53e742ecd2084f0e714b830
2017-06-08 12:46:36 -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
Denis Kuznetsov
47f8490e64 Update restricted list prefrences before dialog creation.
Bug: 30076848
Test: m RunSettingsRoboTests
Change-Id: I6df7f59530acc4ace4b191ae180f8c46dffedc48
2017-06-08 17:20:00 +02:00
Hugo Benichi
539211a718 Instrument sign-in-captive-portal button
Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: WifiDetailPreferenceControllerTest updated
Change-Id: I03dbcdd6efbd0d7aaf2ef67d541fceeb6acc2acf
2017-06-08 22:03:49 +09:00
jackqdyulei
c7ecd6ebff Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2 am: 33cb1408e2
am: 83bcc42e77

Change-Id: I05b8dfbeb11a21617e77dbe3769f80a7a64d8097
2017-06-08 02:19:10 +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