Commit Graph

37812 Commits

Author SHA1 Message Date
TreeHugger Robot
01ebe2d6fa Merge "Limit unconfigurability to specified channels." 2017-06-12 20:12:36 +00:00
Tarandeep Singh
86b8f4460d Fix keyboard not launching on screen lock settings.
calling requestFocus() on EditText fixes the issue.

Bug: 62344628
Test: manual
Change-Id: If8321cb646dca5882d5a44bd1ec2f66f0f4ec5aa
2017-06-12 19:38:03 +00:00
Maurice Lam
5b2ed748db Merge "Increase CHAR LIMIT" into oc-dr1-dev am: cd2cb4511a
am: 546cae8e38

Change-Id: Ia4ff1281c59abbca132b7f06bde4d7bfbe2ebccb
2017-06-12 18:41:20 +00:00
Maurice Lam
546cae8e38 Merge "Increase CHAR LIMIT" into oc-dr1-dev
am: cd2cb4511a

Change-Id: I96a2e76f42d2972eaa2542c7d4d94a728c48ead2
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
Salvador Martinez
928b763792 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
2017-06-12 18:30:21 +00:00
Ruchi Kandoi
23054b656f May nfc_payments_how_it_works layout scrollable.
Test: Increase display size and check the layout
Bug: 37792774
Change-Id: Ifceb2c5f05553d5672e9b2676255549fded3fbec
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-06-12 11:12:21 -07:00
Alison Cichowlas
bbd4fc124a Limit unconfigurability to specified channels.
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 13:44:38 -04:00
Andrew Sapperstein
478eb023d3 Update advanced battery screen to use headline font. am: e2a276f2b6
am: 4aba04c690

Change-Id: Id6f55121314aae21da1ea9ce2141b46f2aa472d6
2017-06-12 17:44:12 +00:00
Andrew Sapperstein
4aba04c690 Update advanced battery screen to use headline font.
am: e2a276f2b6

Change-Id: I920fe5c52fae1f8ec873f999dff72d79bcc2cd9a
2017-06-12 17:41:10 +00:00
TreeHugger Robot
c37e0c1e47 Merge "Update restricted list prefrences before dialog creation." 2017-06-12 11:47:13 +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
446f2d2896 Import translations. DO NOT MERGE am: 5a3748e39a -s ours
am: 7fb248e126  -s ours

Change-Id: Ic098c9d9fabb9529da9e51c007aeea2129dd211a
2017-06-10 06:17:33 +00:00
Bill Yi
7fb248e126 Import translations. DO NOT MERGE
am: 5a3748e39a  -s ours

Change-Id: Ie76608b1e36973b34eb896cbf5871fa9b658fc39
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
2ce5649a67 Update SummaryPreference to use config_headlineFontFamily. am: be3972d7c2
am: 3c8b5fa905

Change-Id: I5de459efc257a13d17ffe520c783f5cf9582563e
2017-06-09 23:16:33 +00:00
Andrew Sapperstein
3c8b5fa905 Update SummaryPreference to use config_headlineFontFamily.
am: be3972d7c2

Change-Id: I794adde11115dbcbcdc07f3307c284253a4a33b0
2017-06-09 22:50:29 +00:00
jackqdyulei
bf4a2a1afe 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
2017-06-09 15:14:28 -07: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
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
d60511d6ca Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
am: 1dc3f38506

Change-Id: If51ce88bc44c123080c3853152f026fc3c2d23ea
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
d694c8bc33 Merge "Create new category for lock screen redaction" into oc-dr1-dev am: bacb9fc459
am: a61192df26

Change-Id: Id9dca7989dafd788d1fb46ca7b28ca9c3f08072e
2017-06-09 17:20:16 +00:00
Maurice Lam
a61192df26 Merge "Create new category for lock screen redaction" into oc-dr1-dev
am: bacb9fc459

Change-Id: I5d9d673d07d84cb630a04e620c8818f187350cc0
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
b00418f989 Merge "Add intent action to support page" into oc-dr1-dev am: 128fd39a13
am: 73f137c74c

Change-Id: Ide45ba2f36327e2b864a6f58d288c70b89140ed2
2017-06-09 16:57:49 +00:00
Maurice Lam
73f137c74c Merge "Add intent action to support page" into oc-dr1-dev
am: 128fd39a13

Change-Id: I50ef5d7f0a403389339b041c6064bfc188a7d4cd
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
8777019583 Refactor test runner to use static list of resource paths am: 9f1e911759
am: d745ed5972

Change-Id: I445876e61890633ed05761ee21e1efa66c956307
2017-06-09 16:35:43 +00:00
Andrew Sapperstein
d745ed5972 Refactor test runner to use static list of resource paths
am: 9f1e911759

Change-Id: I5d00898c2c3f335f543fcbd31f2b977e67ad1abd
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
cd9e91e0ac Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60 am: 92661526d4
am: 827ce8bc90

Change-Id: I9e69ee5b898820fc21b87b5a6faf858b14f85b1c
2017-06-09 16:06:46 +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
827ce8bc90 Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60
am: 92661526d4

Change-Id: I915fc0691158c2b7a7c4adccc038f79fad8ccfd8
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

Change-Id: I011faf9c0b0ea10ab9c23caa2daa0e5b74915900
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

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
359b035d34 Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev am: 5d02b8b85f
am: e880102a80

Change-Id: I5e72b91b1eb291a35bf31a65a87a4c9a186dd432
2017-06-09 09:02:42 +00:00
Hugo Benichi
e880102a80 Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
am: 5d02b8b85f

Change-Id: I0c3429fa16cf6b69c401f33ddc51f161eed02dff
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
jackqdyulei
74cccfd1df Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8 am: 3aae1f336e -s ours" into oc-dr1-dev-plus-aosp
am: 5f86be6cce  -s ours

Change-Id: I463463084d959b1e3e9c20a429686040d050c72e
2017-06-09 08:40:10 +00:00
jackqdyulei
94a34e48a6 Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8 -s ours am: 8a241a438b -s ours
am: abdac61f08  -s ours

Change-Id: I631fbde26ad1547d8cece3611f0eaea207f9cf40
2017-06-09 08:39:43 +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  -s ours

Change-Id: Ia7fd253450ff8224724b1ed15f689fe4dc9b4d1d
2017-06-09 08:37:15 +00:00
jackqdyulei
4f9bfbcb64 Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8
am: 3aae1f336e  -s ours

Change-Id: I1f2a83c9f65231c4b6c3d119a3cf67507b10f3b5
2017-06-09 08:37:15 +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
jackqdyulei
8a241a438b Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am: 4f02eebab8  -s ours

Change-Id: I19ee339c025e3db0c26cd323b65db1131980733e
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