Maurice Lam
546cae8e38
Merge "Increase CHAR LIMIT" into oc-dr1-dev
...
am: cd2cb4511a
2017-06-12 18:38:52 +00:00
Maurice Lam
cd2cb4511a
Merge "Increase CHAR LIMIT" into oc-dr1-dev
2017-06-12 18:34:33 +00:00
Andrew Sapperstein
4aba04c690
Update advanced battery screen to use headline font.
...
am: e2a276f2b6
2017-06-12 17:41:10 +00:00
Maurice Lam
225d4f2ea8
Increase CHAR LIMIT
...
Test: Existing tests pass
Bug: 62362729
Bug: 62401881
Change-Id: I4416db079d35cfdedd69670eaa92ef62bcacca80
2017-06-11 21:17:09 +00:00
Andrew Sapperstein
e2a276f2b6
Update advanced battery screen to use headline font.
...
Change-Id: I8e70cc8093cccbe67b7c363a60a03f0eb1cda2e5
Fixes: 62507326
Test: robotests
2017-06-10 18:00:45 -07:00
Bill Yi
7fb248e126
Import translations. DO NOT MERGE
...
am: 5a3748e39a
2017-06-10 06:09:16 +00:00
Bill Yi
5a3748e39a
Import translations. DO NOT MERGE
...
Change-Id: I2cf44e9a52a89c9d4ebdfa3e05897e68e6ea505f
Auto-generated-cl: translation import
2017-06-09 18:36:51 -07:00
Andrew Sapperstein
3c8b5fa905
Update SummaryPreference to use config_headlineFontFamily.
...
am: be3972d7c2
2017-06-09 22:50:29 +00:00
Andrew Sapperstein
be3972d7c2
Update SummaryPreference to use config_headlineFontFamily.
...
Also deleted a couple of unused files.
Change-Id: I42b6f6c79c3a7ba00040d657204830c5a468a2b2
Fixes: 62385826
Test: manual
2017-06-09 13:41:06 -07:00
Daniel Nishi
d60511d6ca
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
...
am: 1dc3f38506
2017-06-09 18:07:15 +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
Maurice Lam
a61192df26
Merge "Create new category for lock screen redaction" into oc-dr1-dev
...
am: bacb9fc459
2017-06-09 17:17:16 +00:00
Maurice Lam
bacb9fc459
Merge "Create new category for lock screen redaction" into oc-dr1-dev
2017-06-09 17:07:47 +00:00
Maurice Lam
73f137c74c
Merge "Add intent action to support page" into oc-dr1-dev
...
am: 128fd39a13
2017-06-09 16:55:29 +00:00
Maurice Lam
128fd39a13
Merge "Add intent action to support page" into oc-dr1-dev
2017-06-09 16:50:56 +00:00
Andrew Sapperstein
d745ed5972
Refactor test runner to use static list of resource paths
...
am: 9f1e911759
2017-06-09 16:33: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
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
