Commit Graph

38898 Commits

Author SHA1 Message Date
Andrew Sapperstein
df916872c1 Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
am: 1ee62c16a3

Change-Id: I7f051180f0938d3eb467e87c522fc9fb4b12e5f5
2017-07-27 01:36:57 +00:00
Bill Yi
97bed117da Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
am: ef36ef28d9  -s ours

Change-Id: Iec10999409679807df916e04ca9413385c33093f
2017-07-27 01:36:32 +00:00
Matthew Fritze
cba96eb672 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
am: 68617a6f42

Change-Id: Ibe30aace8256cc25a1856f90877ea57a73f60419
2017-07-27 01:35:04 +00:00
Doris Ling
e866cd4825 Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
am: 8e13218ec8

Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05
2017-07-27 01:33:52 +00:00
jackqdyulei
220b1f163a Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
am: 063e87c689

Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565
2017-07-27 01:33:28 +00:00
Andrew Sapperstein
8f25bc916a Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am: 5d7fab4f22

Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef
2017-07-27 01:32:37 +00:00
Bill Yi
a9fc19e385 Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: e3e1e7b9d4  -s ours

Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
2017-07-27 01:24:51 +00:00
Andrew Sapperstein
1ee62c16a3 Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509
2017-07-27 01:21:05 +00:00
Bill Yi
ef36ef28d9 Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: b0126e3500  -s ours

Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
2017-07-27 01:20:25 +00:00
Andrew Sapperstein
fe35c40dad Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be
2017-07-27 01:20:05 +00:00
Matthew Fritze
68617a6f42 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
2017-07-27 01:20:02 +00:00
Bill Yi
1602913a75 Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: b0126e3500  -s ours

Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00
2017-07-27 01:10:19 +00:00
Matthew Fritze
9092e1a0b0 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
2017-07-27 01:09:55 +00:00
jackqdyulei
75e89dfede Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
2017-07-27 01:08:43 +00:00
Andrew Sapperstein
7b445d59ef Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev 2017-07-27 01:01:26 +00:00
Bill Yi
b0126e3500 Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a  -s ours

Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
2017-07-27 00:55:57 +00:00
Bill Yi
e3e1e7b9d4 Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a  -s ours

Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620
2017-07-27 00:55:32 +00:00
jackqdyulei
aa5618fd82 Add ResultPayload for Allow notification dots
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-26 17:55:11 -07:00
TreeHugger Robot
8e13218ec8 Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev 2017-07-27 00:50:10 +00:00
Andrew Sapperstein
b3cf0a0923 Fix more config_headlineFontFamily-induced test breakages
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests
2017-07-26 17:41:48 -07:00
TreeHugger Robot
c2cb0d0b9e Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev 2017-07-27 00:31:13 +00:00
jackqdyulei
063e87c689 Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
2017-07-27 00:05:53 +00:00
TreeHugger Robot
02560caa92 Merge "Set minLines for battery header text" into oc-dr1-dev 2017-07-26 23:46:42 +00:00
TreeHugger Robot
5d7fab4f22 Merge "Add ambient notifications as inline setting." into oc-mr1-dev 2017-07-26 23:34:22 +00:00
Bill Yi
64ce525c6a Import translations. DO NOT MERGE
am: 05185952c8  -s ours

Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
2017-07-26 23:22:33 +00:00
Ajay Nadathur
353fb3424b Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 044485b850
am: 06a9a033a0

Change-Id: If6323b25f3678a9cb614d005d67e350746778987
2017-07-26 22:53:34 +00:00
Ajay Nadathur
040db7c4f6 Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 3c308aef22
am: 03737f1c9c

Change-Id: Id274a3c6fb6374e6db459bea150984a85fd3e8ad
2017-07-26 22:53:03 +00:00
Bill Yi
f28d20b118 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 975d9a18f1 -s ours
am: fee1e54914  -s ours

Change-Id: If9d2805f0f3ba0d9bf9056923d5611dd50cf22cc
2017-07-26 22:52:25 +00:00
jackqdyulei
bc86e4747f Don't update the header when toggle menu
If we only toggle the app type in battery settings, don't update
the header. Then it won't have flicker in battery header.

Bug: 64065456
Test: RunSettingsRoboTest
Change-Id: If1cfa745f723f808ad9c5fd921be797acd3199ba
2017-07-26 15:28:59 -07:00
Ajay Nadathur
06a9a033a0 Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
am: 044485b850

Change-Id: Ifae5025374a37d1bf8cc07a8af013bff9267f8d5
2017-07-26 22:26:27 +00:00
Ajay Nadathur
03737f1c9c Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
am: 3c308aef22

Change-Id: Idc7a3f732ca5977ad14dfb9e05db3d80898dc822
2017-07-26 22:16:46 +00:00
Ajay Nadathur
044485b850 Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
2017-07-26 22:02:33 +00:00
Ajay Nadathur
3c308aef22 Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
2017-07-26 22:02:05 +00:00
Ajay Nadathur
f5ebc6f7ed Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev 2017-07-26 21:42:12 +00:00
TreeHugger Robot
76e4804a63 Merge "Import translations. DO NOT MERGE" 2017-07-26 21:41:58 +00:00
Andrew Sapperstein
50ca1968e6 Add ambient notifications as inline setting.
Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:20:19 +00:00
Andrew Sapperstein
e8e65a367b Add ambient notifications as inline setting.
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:19:19 +00:00
Matthew Fritze
c36ec8e629 Change SwipeForNotification Payload default to Off
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
2017-07-26 12:59:50 -07:00
Bill Yi
fee1e54914 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 975d9a18f1  -s ours

Change-Id: Id7b12d9714304d13c6b0fa60a4a3b2eec9b4c160
2017-07-26 19:47:51 +00:00
Maurice Lam
f88a617468 Raise CHAR LIMIT and update description
Raise header CHAR LIMIT to 40, and update the description to tell
translators to translate "Set fingerprint backup" if the translation
cannot fit within 40 chars.

Test: Existing tests pass
Bug: 63541502
Change-Id: Ie37e574873d73fc24a3acef5c3c054a561a16f3f
2017-07-26 19:47:44 +00:00
TreeHugger Robot
975d9a18f1 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-07-26 19:39:46 +00:00
Bill Yi
85f1f40f06 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: bd429f42cb -s ours
am: 8c88b53dda  -s ours

Change-Id: If72aa100f75f5b39945a0d33402dc74b09b88c07
2017-07-26 18:49:07 +00:00
jackqdyulei
dbe6bd3984 Set minLines for battery header text
So the header won't grow/shrink when the text changes.

Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
2017-07-26 11:24:54 -07:00
Doris Ling
9042f822a6 Fix gestures summary text when there is no sensor for assit.
Should exit the summary handling if sensor is not available.

Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests
2017-07-26 11:07:19 -07:00
Bill Yi
8c88b53dda Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
am: bd429f42cb  -s ours

Change-Id: Ia36706cecaa4a47f7c5963bbd76702b918fcf51d
2017-07-26 17:48:32 +00:00
Bill Yi
d0b7e0bca9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: eca6781a49 -s ours
am: db8172a4fe  -s ours

Change-Id: I185a23d087c53962fca769bb8a6573440311bd64
2017-07-26 17:36:09 +00:00
Antony Sargent
6a6484f5f5 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4 am: 1e69f27a41
am: 2665600b75  -s ours

Change-Id: I097be7c19bcf4b3fb3a84e8b8b374e07313ab0d1
2017-07-26 17:31:06 +00:00
Bill Yi
05185952c8 Import translations. DO NOT MERGE
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:27:31 -07:00
Bill Yi
67133670a6 Import translations. DO NOT MERGE
Change-Id: If81b78db0b3575bccde65cb54ee824b4897ddc56
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:26:10 -07:00
Bill Yi
db8172a4fe Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
am: eca6781a49  -s ours

Change-Id: I76deaa778d926e596a7da86e660c6356a1c4f704
2017-07-26 17:26:06 +00:00