Commit Graph

36928 Commits

Author SHA1 Message Date
Bill Yi
af27a8fd5b Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 42e494228b  -s ours

Change-Id: Ia4b841e5b804c887d6c381d6d2e500a82509fac5
2017-06-13 09:51:01 +00:00
TreeHugger Robot
42e494228b Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-13 09:45:21 +00:00
Android Build Merger (Role)
8315525c76 Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours am: 0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp 2017-06-13 08:15:27 +00:00
Bill Yi
1c6a01293a Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours
am: 0c2bb34f5c  -s ours

Change-Id: I12f734080ccfbaa17c16b8664ebe266b10fa1a57
2017-06-13 08:15:09 +00:00
Bill Yi
52eb891200 Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours
am: e637b663e8  -s ours

Change-Id: Ia3a3e2f45af0f493327ab9dc64bdc20af791c5fa
2017-06-13 08:14:54 +00:00
Bill Yi
0c2bb34f5c Merge "Import translations. DO NOT MERGE" into oc-dev
am: 327b9119d7  -s ours

Change-Id: I24da3a236478e91b06710a4065ba29663921f940
2017-06-13 08:11:23 +00:00
Bill Yi
e637b663e8 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 327b9119d7  -s ours

Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
2017-06-13 08:11:23 +00:00
TreeHugger Robot
327b9119d7 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-13 08:07:08 +00:00
Alison Cichowlas
c8752ca07c Limit unconfigurability to specified channels. am: 80fa6b5833
am: 665384a8eb

Change-Id: Iefb97be4d3c6a73c748347f37a25a4233a65aead
2017-06-13 01:59:42 +00:00
Alison Cichowlas
79f12ed51e Limit unconfigurability to specified channels. am: 80fa6b5833
am: 0320d4e69f

Change-Id: Icc6ba97501c229ae8d5bf5a7169feae2af85f3a2
2017-06-13 01:49:37 +00:00
Alison Cichowlas
665384a8eb Limit unconfigurability to specified channels.
am: 80fa6b5833

Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
2017-06-13 01:45:10 +00:00
Alison Cichowlas
0320d4e69f Limit unconfigurability to specified channels.
am: 80fa6b5833

Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
2017-06-13 01:41:39 +00:00
Bill Yi
118be8a9d7 Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
2017-06-12 18:23:15 -07:00
Bill Yi
b8f1d3129b Import translations. DO NOT MERGE
Change-Id: I7690f708e8eef5505a3508bbf7998d9638504920
Auto-generated-cl: translation import
2017-06-12 18:16:46 -07:00
Salvador Martinez
303daecc2e Merge "Increase length of string for pref title" into oc-dr1-dev
am: 34373c8f33

Change-Id: I4a3d05aade72fc2de50a8fc6df574d8073bdafd6
2017-06-13 00:22:47 +00:00
TreeHugger Robot
34373c8f33 Merge "Increase length of string for pref title" into oc-dr1-dev 2017-06-13 00:13:43 +00:00
Alison Cichowlas
80fa6b5833 Limit unconfigurability to specified channels.
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 23:17:11 +00:00
Tarandeep Singh
521240a317 Fix keyboard not launching on screen lock settings.
am: 86b8f4460d

Change-Id: I21b872ac9edacd625c0995b9c878cbe91f82cc2b
2017-06-12 22:33:08 +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
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
Andrew Sapperstein
4aba04c690 Update advanced battery screen to use headline font.
am: e2a276f2b6

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

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

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
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
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
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
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
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
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