Andrew Sapperstein
8777019583
Refactor test runner to use static list of resource paths am: 9f1e911759
...
am: d745ed5972
2017-06-09 16:35:43 +00:00
Andrew Sapperstein
9f1e911759
Refactor test runner to use static list of resource paths
...
Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.
Bug: 62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
2017-06-09 09:21:26 -07:00
Antony Sargent
96b40a284f
Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60 am: 6a5f36a494
...
am: e20b2ea043
2017-06-09 16:06:09 +00:00
Antony Sargent
6a5f36a494
Merge "Set advanced battery usage items as non-selectable" into oc-dev
...
am: d77b699e60
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
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
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
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
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
2017-06-09 03:00:16 +00:00
jackqdyulei
6525053801
Merge "Update subtitle for apps in battery settings" into oc-dev
...
am: 031b90541f
2017-06-09 02:57:46 +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
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
2017-06-09 01:28:48 +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
Doris Ling
24ab7be89f
Merge "Update text for Languages & Input." into oc-dr1-dev am: 73e03e6ca2
...
am: 94fa9d8f6e
2017-06-09 01:15:38 +00:00
TreeHugger Robot
73e03e6ca2
Merge "Update text for Languages & Input." into oc-dr1-dev
2017-06-09 01:09:25 +00:00
TreeHugger Robot
2a91cda85a
Merge "Add intent action to support page"
2017-06-09 01:01:07 +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
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
Maurice Lam
1bf5454f64
Add intent action to support page
...
Test: cd tests/robotests && mma
Bug: 62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
2017-06-08 12:24:25 -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
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
2017-06-08 02:19:10 +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
TreeHugger Robot
fbd376b1ba
Merge "Add debug data in AnomalyLoader"
2017-06-07 21:51:58 +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
TreeHugger Robot
4d256e4080
Merge "Add saturation boost setting"
2017-06-07 02:36:12 +00:00
jackqdyulei
5753e6d97e
Add debug data in AnomalyLoader
...
Bug: 62299540
Test: RunSettingsRoboTests
Change-Id: Id20db9fc0da8e090385caa982f2fb5a6fa0b2f38
2017-06-06 19:17:42 -07: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
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
