jackqdyulei
|
24f6fc8b05
|
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 063e87c689
am: 220b1f163a
Change-Id: I9f1857004f87e659fdf807bb41cec18a69c60266
|
2017-07-27 05:28:27 +00:00 |
|
Andrew Sapperstein
|
151fb83ea6
|
Merge "Add ambient notifications as inline setting." into oc-mr1-dev am: 5d7fab4f22
am: 8f25bc916a
Change-Id: Icdbd94d006b5c7bcc0251d657342ee6c90f7ef48
|
2017-07-27 05:27:57 +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 |
|
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 |
|
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 |
|
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
|
e8e65a367b
|
Add ambient notifications as inline setting.
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
|
2017-07-26 20:19:19 +00: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 |
|
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 |
|
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
|
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 |
|
Antony Sargent
|
2665600b75
|
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
am: 1e69f27a41
Change-Id: Iaf5a8c94d8efc7ca22b242f725a9fd94145a163b
|
2017-07-26 17:09:14 +00:00 |
|
Bill Yi
|
eca6781a49
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df -s ours
Change-Id: I8b980099381db8f56e3a339dfe497cce93595674
|
2017-07-26 17:04:23 +00:00 |
|
Bill Yi
|
bd429f42cb
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df -s ours
Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd
|
2017-07-26 16:46:51 +00:00 |
|
TreeHugger Robot
|
402abcc9df
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
|
2017-07-26 16:31:13 +00:00 |
|
Antony Sargent
|
002468735f
|
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4 am: c3cd88c302
am: 1c84e34cb5 -s ours
Change-Id: I9a9d319d578a0fddb4d1c80e8535df7b1429d601
|
2017-07-26 16:31:13 +00:00 |
|
Antony Sargent
|
1c84e34cb5
|
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
am: c3cd88c302
Change-Id: Ibeca8eb7fd61b0a730dc4c77a80a152d69eba0ca
|
2017-07-26 16:19:02 +00:00 |
|
Antony Sargent
|
1e69f27a41
|
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4
Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
|
2017-07-26 16:18:50 +00:00 |
|
Bill Yi
|
0d07e5e3f3
|
Import translations. DO NOT MERGE
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
|
2017-07-26 08:07:49 -07:00 |
|
Bill Yi
|
d5390dac46
|
Import translations. DO NOT MERGE
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
|
2017-07-26 07:32:24 -07:00 |
|
Antony Sargent
|
c3cd88c302
|
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4
Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25
|
2017-07-26 11:12:39 +00:00 |
|
TreeHugger Robot
|
9fb7a3b8b4
|
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
|
2017-07-26 10:53:30 +00:00 |
|
Bill Yi
|
467650b622
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 0c3ee7c15d -s ours am: 565664fad7 -s ours
am: c2d779e568 -s ours
Change-Id: I1a750cb3a19c8ebada11b915bd3129da8c7f195a
|
2017-07-26 09:07:36 +00:00 |
|
Bill Yi
|
c2d779e568
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 0c3ee7c15d -s ours
am: 565664fad7 -s ours
Change-Id: I58da132af7b082860813238be8b054955629cbc9
|
2017-07-26 08:46:06 +00:00 |
|
Bill Yi
|
565664fad7
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 0c3ee7c15d -s ours
Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5
|
2017-07-26 08:24:19 +00:00 |
|
Bill Yi
|
0ab288e682
|
Merge "Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: 9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
am: 13607bdea0 -s ours
Change-Id: I94cd202beea0cb9ce4569ff07fb5b894da5330c3
|
2017-07-26 08:11:26 +00:00 |
|
Bill Yi
|
5847639361
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: a2954b3232 -s ours
am: 2bfaa1856b -s ours
Change-Id: I5d3f413bec8f870a61514c4da3f7f452dcf5c20f
|
2017-07-26 08:11:05 +00:00 |
|
Android Build Merger (Role)
|
13607bdea0
|
Merge "Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: 9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
|
2017-07-26 08:06:55 +00:00 |
|
Bill Yi
|
37425295cf
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
am: 9d33ddc3f7 -s ours
Change-Id: I8fb617839c8e4e691ac823301c006b2636eb0957
|
2017-07-26 08:06:37 +00:00 |
|
Bill Yi
|
2bfaa1856b
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
am: a2954b3232 -s ours
Change-Id: Id6eb63a599efb450f30d5dddc0973c1936daf6df
|
2017-07-26 08:06:35 +00:00 |
|
Bill Yi
|
0c3ee7c15d
|
Import translations. DO NOT MERGE
am: 8a25fb603a -s ours
Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f
|
2017-07-26 08:06:13 +00:00 |
|
Bill Yi
|
9d33ddc3f7
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 9d7971905c -s ours
Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf
|
2017-07-26 08:03:07 +00:00 |
|
Bill Yi
|
a2954b3232
|
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 9d7971905c -s ours
Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88
|
2017-07-26 08:03:05 +00:00 |
|
Bill Yi
|
9d7971905c
|
Import translations. DO NOT MERGE
am: 8a25fb603a -s ours
Change-Id: If4a3775dac048d13e739174b79415cf025bd4454
|
2017-07-26 07:59:05 +00:00 |
|
TreeHugger Robot
|
8eb816c940
|
Merge "Allow open password dialog for wrong-password wifi access points"
|
2017-07-26 07:23:37 +00:00 |
|