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
827ce8bc90
Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60
...
am: 92661526d4
2017-06-09 15:57:25 +00:00
Antony Sargent
e20b2ea043
Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60
...
am: 6a5f36a494
2017-06-09 15:54:38 +00:00
Antony Sargent
92661526d4
Merge "Set advanced battery usage items as non-selectable" into oc-dev
...
am: d77b699e60
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
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
e880102a80
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
...
am: 5d02b8b85f
2017-06-09 09:00:11 +00:00
Hugo Benichi
5d02b8b85f
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
2017-06-09 08:56:19 +00:00
Android Build Merger (Role)
5f86be6cce
Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8 am: 3aae1f336e -s ours" into oc-dr1-dev-plus-aosp
2017-06-09 08:37:41 +00:00
jackqdyulei
abdac61f08
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8 -s ours
...
am: 8a241a438b
2017-06-09 08:37:15 +00:00
jackqdyulei
4f9bfbcb64
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8
...
am: 3aae1f336e
2017-06-09 08:37:15 +00:00
jackqdyulei
3aae1f336e
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
...
am: 4f02eebab8
2017-06-09 08:34:46 +00:00
jackqdyulei
8a241a438b
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
...
am: 4f02eebab8
2017-06-09 08:34:43 +00:00
TreeHugger Robot
4f02eebab8
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
2017-06-09 08:29:57 +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
jackqdyulei
3f3e44114e
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev
...
am: 4c4e780577
2017-06-09 04:47:21 +00:00
TreeHugger Robot
4c4e780577
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev
2017-06-09 04:39:41 +00:00
Android Build Merger (Role)
8fcd16a93f
Merge "Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f am: 6525053801" into oc-dr1-dev-plus-aosp
2017-06-09 03:01:08 +00:00
jackqdyulei
e062096549
Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f
...
am: 6525053801
2017-06-09 03:00:53 +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
Fan Zhang
ab7a0d1619
Merge "Use support feature provider to provide intro url." into oc-dr1-dev
...
am: bdc0816982
2017-06-09 03:00:16 +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
424edd3064
Merge "Update subtitle for apps in battery settings" into oc-dev
...
am: 031b90541f
2017-06-09 02:57:46 +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
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
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
e844588e0e
Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33
...
am: d07e14fb5b
2017-06-09 01:26:29 +00:00
Matthew Fritze
0514c19273
Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33
...
am: 824f25320a
2017-06-09 01:25:38 +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
94fa9d8f6e
Merge "Update text for Languages & Input." into oc-dr1-dev
...
am: 73e03e6ca2
2017-06-09 01:13:36 +00:00
TreeHugger Robot
73e03e6ca2
Merge "Update text for Languages & Input." into oc-dr1-dev
2017-06-09 01:09:25 +00:00
Maurice Lam
5f0edba5c7
Add intent action to support page
...
Test: cd tests/robotests && mma
Bug: 62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
(cherry picked from commit 1bf5454f64
2017-06-09 01:03:29 +00:00
Android Build Merger (Role)
feaa8fe083
Merge "Merge "Update the music files icon." into oc-dev am: 47c6afde7f am: 60287a50e8" into oc-dr1-dev-plus-aosp
2017-06-09 00:20:58 +00:00
Daniel Nishi
08f3e244c8
Merge "Update the music files icon." into oc-dev am: 47c6afde7f
...
am: 60287a50e8
2017-06-09 00:20:34 +00:00
Daniel Nishi
b50e0063e2
Merge "Update the music files icon." into oc-dev am: 47c6afde7f
...
am: f928324747
2017-06-09 00:20:31 +00:00
Maurice Lam
4331a2e258
Create new category for lock screen redaction
...
So that we can show it without all the other default setup wizard
only actions.
Test: Manual
Bug: 62278041
Change-Id: Iba8a626b9b6e1ae909b4f6260dae7c0462b92627
(cherry picked from commit 96ae3f82b3
2017-06-09 00:19:12 +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
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
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
2017-06-08 22:55:00 +00:00
Bill Yi
a372e3c40e
Import translations. DO NOT MERGE am: 29a7bce4e5 -s ours
...
am: 7134ca433b
2017-06-08 22:53:09 +00:00
