OSDN Git Service
Tony Mantler [Wed, 14 Jun 2017 18:07:12 +0000 (18:07 +0000)]
Merge "Use Settings.ACTION_ADD_ACCOUNT"
Kevin Chyn [Wed, 14 Jun 2017 02:00:37 +0000 (02:00 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev am:
6f365765f7
am:
36d4b81119
Change-Id: I789735e5c4c72b16597320b62b46ad2fbf46acc5
Kevin Chyn [Wed, 14 Jun 2017 01:51:50 +0000 (01:51 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
am:
6f365765f7
Change-Id: I23f3bdbcbd60c80842a51da61a16225252dc179c
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
Tarandeep Singh [Wed, 14 Jun 2017 00:27:16 +0000 (00:27 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev am:
fc9622ef53
am:
4c2ef7c144
Change-Id: I8e38b190c0d28c763eb95e476ca21f0672a31727
Tarandeep Singh [Wed, 14 Jun 2017 00:06:44 +0000 (00:06 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
am:
fc9622ef53
Change-Id: I4390c0d04e56726950b9a404e4d5fe6483d6b9ee
jackqdyulei [Tue, 13 Jun 2017 23:58:14 +0000 (23:58 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev am:
e7735b8d52
am:
010c9d9535
Change-Id: I5d7d02d5387b8d58d8ea6f158311c1aae659fe19
TreeHugger Robot [Tue, 13 Jun 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 23:11:35 +0000 (23:11 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev am:
9871df58f1
am:
9922ec065d
Change-Id: Ib948ffa809eb64b9077f20e174d1e2b89ede38a0
jackqdyulei [Tue, 13 Jun 2017 23:10:40 +0000 (23:10 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev am:
d907b99d79
am:
0966eeb919
Change-Id: I9ac8bee459bdc7409e0c46112e5c59bb69032c50
jackqdyulei [Tue, 13 Jun 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
am:
e7735b8d52
Change-Id: I01b51abb73fdc39597388878a846266c339815e2
TreeHugger Robot [Tue, 13 Jun 2017 22:36:04 +0000 (22:36 +0000)]
Merge "Add action active check for anomaly action." into oc-dr1-dev
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:22:13 +0000 (22:22 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
am:
9871df58f1
Change-Id: I0f5e5069ff4a69004dce46921f894cde9d4d854f
Tony Mantler [Tue, 13 Jun 2017 22:16:50 +0000 (15:16 -0700)]
Use Settings.ACTION_ADD_ACCOUNT
Bug:
62586588
Test: No functional change
Change-Id: I01ffc240fe7299a6d5f08c390870eaf3ba0f4260
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
Kevin Chyn [Fri, 9 Jun 2017 20:37:14 +0000 (13:37 -0700)]
Move assist gestures settings to overlay
Bug:
37427306
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
Maurice Lam [Tue, 13 Jun 2017 21:50:20 +0000 (21:50 +0000)]
Merge "Allow skipping PIN setup screen"
jackqdyulei [Tue, 13 Jun 2017 21:48:51 +0000 (21:48 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
am:
d907b99d79
Change-Id: Icb92d38004bbbc109e7867638528bc7d80b9ac29
TreeHugger Robot [Tue, 13 Jun 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Update dialogs for anomaly" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 00:43:29 +0000 (17:43 -0700)]
Add action active check for anomaly action.
This cl adds the action active check for the following actions:
1. ForceStopAction: check whether app is stopped
2. BackgroundActivityAction: check whether background activity
is turned on
If related action is not active, we won't report anomaly
to users. Future cl will add active check for bluetooth anomaly.
Bug:
62452014
Test: RunSettingsRoboTests
Change-Id: Ib490227f4570accf8ca4840a99bf85a022c42a5b
TreeHugger Robot [Tue, 13 Jun 2017 19:27:49 +0000 (19:27 +0000)]
Merge "ActivityPicker shouldn't grant permissions."
Alison Cichowlas [Tue, 13 Jun 2017 11:20:39 +0000 (11:20 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev am:
39efd4ec44
am:
8421bc0d29
Change-Id: Idd4c4eb94d2dde5ec9038c43271769db3d6064a9
Alison Cichowlas [Tue, 13 Jun 2017 11:17:07 +0000 (11:17 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
am:
39efd4ec44
Change-Id: Ic059dc659f8e32a64c5fa018f48ce0470c64ccd8
Alison Cichowlas [Tue, 13 Jun 2017 11:08:32 +0000 (11:08 +0000)]
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
Katsiaryna Naliuka [Mon, 12 Jun 2017 15:37:33 +0000 (17:37 +0200)]
Added support for external tiles to the lockscreen activity
Bug:
62487664
Test: Built and flashed a system image.
Change-Id: I75e42a042f9212e247f02c5523979bcd5ea57baa
Bill Yi [Tue, 13 Jun 2017 09:54:32 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
42e494228b -s ours
am:
af27a8fd5b -s ours
Change-Id: Iec8c0e5e73100ebd98e09ac488684266796573b3
Bill Yi [Tue, 13 Jun 2017 09:51:01 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
42e494228b -s ours
Change-Id: Ia4b841e5b804c887d6c381d6d2e500a82509fac5
TreeHugger Robot [Tue, 13 Jun 2017 09:45:19 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 08:19:20 +0000 (08:19 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
am:
8315525c76 -s ours
Change-Id: Ib1cb17bc34c42d8510a6ae862f37da8496c7d175
Bill Yi [Tue, 13 Jun 2017 08:18:38 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
e637b663e8 -s ours
am:
52eb891200 -s ours
Change-Id: Ie74f6de413268659df89f43356ffbc6be208ec74
Android Build Merger (Role) [Tue, 13 Jun 2017 08:15:26 +0000 (08:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours am:
0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 08:15:09 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours
am:
0c2bb34f5c -s ours
Change-Id: I12f734080ccfbaa17c16b8664ebe266b10fa1a57
Bill Yi [Tue, 13 Jun 2017 08:14:54 +0000 (08:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
327b9119d7 -s ours
am:
e637b663e8 -s ours
Change-Id: Ia3a3e2f45af0f493327ab9dc64bdc20af791c5fa
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I24da3a236478e91b06710a4065ba29663921f940
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
TreeHugger Robot [Tue, 13 Jun 2017 08:07:07 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 07:58:27 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Alison Cichowlas [Tue, 13 Jun 2017 03:04:40 +0000 (23:04 -0400)]
Fix build - fix import of SettingsRobolectricTestRunner.
Test: Only changing imports in test files.
Change-Id: Ib0d1433983da36416b979a0eaa1bb57419150374
Alison Cichowlas [Tue, 13 Jun 2017 03:04:08 +0000 (03:04 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833 am:
665384a8eb
am:
c8752ca07c
Change-Id: I0f0dcd3e02ada12e10459a17c7fe7777e66ce4b0
Alison Cichowlas [Tue, 13 Jun 2017 03:03:24 +0000 (03:03 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833 am:
0320d4e69f
am:
79f12ed51e -s ours
Change-Id: I536f9cf36eb0b1f9bd726b39359b4a9e1e6bc577
Alison Cichowlas [Tue, 13 Jun 2017 01:59:42 +0000 (01:59 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833
am:
665384a8eb
Change-Id: Iefb97be4d3c6a73c748347f37a25a4233a65aead
Alison Cichowlas [Tue, 13 Jun 2017 01:49:37 +0000 (01:49 +0000)]
Limit unconfigurability to specified channels. am:
80fa6b5833
am:
0320d4e69f
Change-Id: Icc6ba97501c229ae8d5bf5a7169feae2af85f3a2
Alison Cichowlas [Tue, 13 Jun 2017 01:45:10 +0000 (01:45 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
Alison Cichowlas [Tue, 13 Jun 2017 01:41:39 +0000 (01:41 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
Bill Yi [Tue, 13 Jun 2017 01:23:15 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
Bill Yi [Tue, 13 Jun 2017 01:16:46 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7690f708e8eef5505a3508bbf7998d9638504920
Auto-generated-cl: translation import
Maurice Lam [Sat, 3 Jun 2017 02:22:53 +0000 (19:22 -0700)]
Allow skipping PIN setup screen
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug:
38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
Bill Yi [Tue, 13 Jun 2017 00:55:51 +0000 (17:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iacbdf7b56f66a2b58565ed9e693c7e1a1037d203
Auto-generated-cl: translation import
Salvador Martinez [Tue, 13 Jun 2017 00:40:37 +0000 (00:40 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev am:
34373c8f33
am:
303daecc2e
Change-Id: Id8f53be571159b5bb39862afe2312f9e021bef0b
Tarandeep Singh [Mon, 12 Jun 2017 22:32:28 +0000 (15:32 -0700)]
Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput
Both View focus (which is triggered by View.requestFocus()) and IME focus
(which is internally handled inside InputMethodManager), are implemented
as delayed tasks on the UI thread. The goal here is to make sure that
InputMethodManager.showSoftInput() always gets called only after the target
EditText gained IME focus.
This requires some tricks, but is basically a solved problem with
ImeAwareEditText introduced by
I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235. Here we can just reuse it.
Note that ConfirmLockPassword & ChooseLockPassword are the only ones
using ScrollToParentEditText. Latter doesn't call IMM.showSoftInput().
Fixes:
62542157
Test: Verified keyboard still shows-up on the ConfirmLock screen.
Change-Id: I892d639f3cc5d43db553b682d5278b8ce2fe72da
Salvador Martinez [Tue, 13 Jun 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
am:
34373c8f33
Change-Id: I4a3d05aade72fc2de50a8fc6df574d8073bdafd6
TreeHugger Robot [Tue, 13 Jun 2017 00:15:57 +0000 (00:15 +0000)]
Merge "settings: Add Camera HAL HDR+ preference"
TreeHugger Robot [Tue, 13 Jun 2017 00:13:43 +0000 (00:13 +0000)]
Merge "Increase length of string for pref title" into oc-dr1-dev
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Tarandeep Singh [Mon, 12 Jun 2017 22:39:37 +0000 (22:39 +0000)]
Fix keyboard not launching on screen lock settings. am:
86b8f4460d
am:
521240a317
Change-Id: Ib056e3677477f1a8b6886095996fe5bc39549e25
Tarandeep Singh [Mon, 12 Jun 2017 22:33:08 +0000 (22:33 +0000)]
Fix keyboard not launching on screen lock settings.
am:
86b8f4460d
Change-Id: I21b872ac9edacd625c0995b9c878cbe91f82cc2b
Chien-Yu Chen [Wed, 31 May 2017 00:59:00 +0000 (17:59 -0700)]
settings: Add Camera HAL HDR+ preference
Add an option for camera HAL HDR+ preference to developer options.
Test: System settings, RunSettingsRoboTests
Bug:
62108454
Change-Id: Ide053e8cc3fd7ad6add0493939a27af5bfb65e42
TreeHugger Robot [Mon, 12 Jun 2017 20:43:11 +0000 (20:43 +0000)]
Merge "Updates strings for "Emergency broadcast"."
TreeHugger Robot [Mon, 12 Jun 2017 20:12:35 +0000 (20:12 +0000)]
Merge "Limit unconfigurability to specified channels."
Tarandeep Singh [Fri, 9 Jun 2017 23:24:14 +0000 (16:24 -0700)]
Fix keyboard not launching on screen lock settings.
calling requestFocus() on EditText fixes the issue.
Bug:
62344628
Test: manual
Change-Id: If8321cb646dca5882d5a44bd1ec2f66f0f4ec5aa
Maurice Lam [Mon, 12 Jun 2017 18:41:20 +0000 (18:41 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev am:
cd2cb4511a
am:
546cae8e38
Change-Id: Ia4ff1281c59abbca132b7f06bde4d7bfbe2ebccb
Maurice Lam [Mon, 12 Jun 2017 18:38:52 +0000 (18:38 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
am:
cd2cb4511a
Change-Id: I96a2e76f42d2972eaa2542c7d4d94a728c48ead2
Maurice Lam [Mon, 12 Jun 2017 18:34:31 +0000 (18:34 +0000)]
Merge "Increase CHAR LIMIT" into oc-dr1-dev
Salvador Martinez [Mon, 12 Jun 2017 18:08:56 +0000 (11:08 -0700)]
Increase length of string for pref title
Translators needed a few more characters in a preference that still
had ample space. This cl simply changes the comment to allow for
the requested character count.
Test: Ensure 25 chars fit (screenshot)
Bug:
62433109
Change-Id: I1bd31c969cc4fea8bcfec794a2d8a7b98778853c
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Andrew Sapperstein [Mon, 12 Jun 2017 17:44:12 +0000 (17:44 +0000)]
Update advanced battery screen to use headline font. am:
e2a276f2b6
am:
4aba04c690
Change-Id: Id6f55121314aae21da1ea9ce2141b46f2aa472d6
Andrew Sapperstein [Mon, 12 Jun 2017 17:41:10 +0000 (17:41 +0000)]
Update advanced battery screen to use headline font.
am:
e2a276f2b6
Change-Id: I920fe5c52fae1f8ec873f999dff72d79bcc2cd9a
TreeHugger Robot [Mon, 12 Jun 2017 11:47:11 +0000 (11:47 +0000)]
Merge "Update restricted list prefrences before dialog creation."
Maurice Lam [Sun, 11 Jun 2017 21:13:24 +0000 (14:13 -0700)]
Increase CHAR LIMIT
Test: Existing tests pass
Bug:
62362729
Bug:
62401881
Change-Id: I4416db079d35cfdedd69670eaa92ef62bcacca80
Andrew Sapperstein [Sun, 11 Jun 2017 01:00:45 +0000 (18:00 -0700)]
Update advanced battery screen to use headline font.
Change-Id: I8e70cc8093cccbe67b7c363a60a03f0eb1cda2e5
Fixes:
62507326
Test: robotests
Bill Yi [Sat, 10 Jun 2017 06:17:33 +0000 (06:17 +0000)]
Import translations. DO NOT MERGE am:
5a3748e39a -s ours
am:
7fb248e126 -s ours
Change-Id: Ic098c9d9fabb9529da9e51c007aeea2129dd211a
Bill Yi [Sat, 10 Jun 2017 06:09:16 +0000 (06:09 +0000)]
Import translations. DO NOT MERGE
am:
5a3748e39a -s ours
Change-Id: Ie76608b1e36973b34eb896cbf5871fa9b658fc39
Bill Yi [Sat, 10 Jun 2017 01:36:51 +0000 (18:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cf44e9a52a89c9d4ebdfa3e05897e68e6ea505f
Auto-generated-cl: translation import
Andrew Sapperstein [Fri, 9 Jun 2017 23:16:33 +0000 (23:16 +0000)]
Update SummaryPreference to use config_headlineFontFamily. am:
be3972d7c2
am:
3c8b5fa905
Change-Id: I5de459efc257a13d17ffe520c783f5cf9582563e
Andrew Sapperstein [Fri, 9 Jun 2017 22:50:29 +0000 (22:50 +0000)]
Update SummaryPreference to use config_headlineFontFamily.
am:
be3972d7c2
Change-Id: I794adde11115dbcbcdc07f3307c284253a4a33b0
jackqdyulei [Fri, 9 Jun 2017 20:29:09 +0000 (13:29 -0700)]
Update dialogs for anomaly
1. Add dialog for background activity action
2. Use new strings in anomaly dialogs
Bug:
62490179
Test: RunSettingsRoboTests
Change-Id: Ide836a4aca939963bd3b15c6d728eed68a6d7f43
Andrew Sapperstein [Fri, 9 Jun 2017 00:27:14 +0000 (17:27 -0700)]
Update SummaryPreference to use config_headlineFontFamily.
Also deleted a couple of unused files.
Change-Id: I42b6f6c79c3a7ba00040d657204830c5a468a2b2
Fixes:
62385826
Test: manual
Daniel Nishi [Fri, 9 Jun 2017 18:20:19 +0000 (18:20 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev am:
1dc3f38506
am:
d60511d6ca
Change-Id: Ic688f627e055fca2e461d394625c1ade1a6ca06c
Daniel Nishi [Fri, 9 Jun 2017 18:07:15 +0000 (18:07 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
am:
1dc3f38506
Change-Id: If51ce88bc44c123080c3853152f026fc3c2d23ea
Daniel Nishi [Fri, 9 Jun 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 17:20:16 +0000 (17:20 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev am:
bacb9fc459
am:
a61192df26
Change-Id: Id9dca7989dafd788d1fb46ca7b28ca9c3f08072e
Maurice Lam [Fri, 9 Jun 2017 17:17:16 +0000 (17:17 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
am:
bacb9fc459
Change-Id: I5d9d673d07d84cb630a04e620c8818f187350cc0
Maurice Lam [Fri, 9 Jun 2017 17:07:47 +0000 (17:07 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 16:57:49 +0000 (16:57 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev am:
128fd39a13
am:
73f137c74c
Change-Id: Ide45ba2f36327e2b864a6f58d288c70b89140ed2
Maurice Lam [Fri, 9 Jun 2017 16:55:29 +0000 (16:55 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
am:
128fd39a13
Change-Id: I50ef5d7f0a403389339b041c6064bfc188a7d4cd
Maurice Lam [Fri, 9 Jun 2017 16:50:55 +0000 (16:50 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
Andrew Sapperstein [Fri, 9 Jun 2017 16:35:43 +0000 (16:35 +0000)]
Refactor test runner to use static list of resource paths am:
9f1e911759
am:
d745ed5972
Change-Id: I445876e61890633ed05761ee21e1efa66c956307
Andrew Sapperstein [Fri, 9 Jun 2017 16:33:43 +0000 (16:33 +0000)]
Refactor test runner to use static list of resource paths
am:
9f1e911759
Change-Id: I5d00898c2c3f335f543fcbd31f2b977e67ad1abd
Andrew Sapperstein [Fri, 9 Jun 2017 02:27:36 +0000 (19:27 -0700)]
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
Antony Sargent [Fri, 9 Jun 2017 16:06:46 +0000 (16:06 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60 am:
92661526d4
am:
827ce8bc90
Change-Id: I9e69ee5b898820fc21b87b5a6faf858b14f85b1c
Antony Sargent [Fri, 9 Jun 2017 16:06:09 +0000 (16:06 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60 am:
6a5f36a494
am:
e20b2ea043
Change-Id: I0c081383954104ab3d22439dffb3a6aefd6efe3a
Antony Sargent [Fri, 9 Jun 2017 15:57:25 +0000 (15:57 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60
am:
92661526d4
Change-Id: I915fc0691158c2b7a7c4adccc038f79fad8ccfd8
Antony Sargent [Fri, 9 Jun 2017 15:54:38 +0000 (15:54 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60
am:
6a5f36a494
Change-Id: I011faf9c0b0ea10ab9c23caa2daa0e5b74915900
Antony Sargent [Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
Antony Sargent [Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13
Antony Sargent [Fri, 9 Jun 2017 15:41:25 +0000 (15:41 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 09:02:42 +0000 (09:02 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev am:
5d02b8b85f
am:
e880102a80
Change-Id: I5e72b91b1eb291a35bf31a65a87a4c9a186dd432
Hugo Benichi [Fri, 9 Jun 2017 09:00:11 +0000 (09:00 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
am:
5d02b8b85f
Change-Id: I0c3429fa16cf6b69c401f33ddc51f161eed02dff
Hugo Benichi [Fri, 9 Jun 2017 08:56:17 +0000 (08:56 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
OSDN Git Service
