TreeHugger Robot
a8e793b9d4
Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
...
am: 1dc396f
* commit '1dc396f8f4bcadca3c39ea9f4025d669564f171b':
Improve the layout-related comments.
Change-Id: I900676d63fdb55957de1d6a798c1530f2d2e0f12
2016-04-28 02:43:31 +00:00
Elliott Hughes
1dc396f8f4
Merge "Improve the layout-related comments." into nyc-dev
...
am: 343eb72
* commit '343eb722ddd0146e5c752419b3ff9537cfa2d31d':
Improve the layout-related comments.
Change-Id: Ib4ff24016ae056a61e755cd953739418035cd8e9
2016-04-28 02:40:39 +00:00
TreeHugger Robot
343eb722dd
Merge "Improve the layout-related comments." into nyc-dev
2016-04-28 02:36:12 +00:00
Tianjie Xu
43a4bb0ba0
Merge "Update background text for recovery UI" into nyc-dev am: eeca191
...
am: e890e19
* commit 'e890e194d7861307722a39b8689894ce600be2cb':
Change-Id: Ib4869307f14f836ebe6066d4e406c46ac0193de6
2016-04-28 02:11:28 +00:00
Elliott Hughes
b6faf00b9b
Merge "Update recovery UI." into nyc-dev am: 2f1eedd
...
am: 21092a9
* commit '21092a98235d98f431c88ac5f4369ab1ccf0ae9f':
Change-Id: I045e0c51a42c6026c9dfe7c7bb4ddc20479ccd8f
2016-04-28 02:11:27 +00:00
Tianjie Xu
960691a34f
Merge "Update background text for recovery UI" into nyc-dev am: eeca191
...
am: d57691e
* commit 'd57691e094ad6760864fba19fbbeb3805391b950':
Update background text for recovery UI
Change-Id: Id296d644207fa5aa86c058c90cd52b1500ee4250
2016-04-28 01:01:41 +00:00
Tianjie Xu
e890e194d7
Merge "Update background text for recovery UI" into nyc-dev
...
am: eeca191
* commit 'eeca191f383d1fda6b1153cf4f443cafff7d7328':
Update background text for recovery UI
Change-Id: Iacdeece3cee076f1cbb084e4886c3a412f7af9b9
2016-04-28 00:58:33 +00:00
Tianjie Xu
d57691e094
Merge "Update background text for recovery UI" into nyc-dev
...
am: eeca191
* commit 'eeca191f383d1fda6b1153cf4f443cafff7d7328':
Update background text for recovery UI
Change-Id: I8b959e81da42baa1e95813bf6cab9a2fe374bb11
2016-04-28 00:58:33 +00:00
Tianjie Xu
eeca191f38
Merge "Update background text for recovery UI" into nyc-dev
2016-04-28 00:48:32 +00:00
Elliott Hughes
3b13de8c9c
Merge "Update recovery UI." into nyc-dev am: 2f1eedd
...
am: 75191f3
* commit '75191f32a56db352722ab9ac1acf9ceb08485a04':
Update recovery UI.
Change-Id: I190b15530558a9d18fbe7202893bb7a76c5d3ff5
2016-04-28 00:47:09 +00:00
Elliott Hughes
21092a9823
Merge "Update recovery UI." into nyc-dev
...
am: 2f1eedd
* commit '2f1eedded83eea1956ee8b4d391000584588f094':
Update recovery UI.
Change-Id: Ib43b37f60902b13d1fc4110ad5b394c3c3b39332
2016-04-28 00:44:24 +00:00
Elliott Hughes
75191f32a5
Merge "Update recovery UI." into nyc-dev
...
am: 2f1eedd
* commit '2f1eedded83eea1956ee8b4d391000584588f094':
Update recovery UI.
Change-Id: I881497ab669ef7e105a208c4c17062e6dc321380
2016-04-28 00:44:24 +00:00
Elliott Hughes
a369104971
Improve the layout-related comments.
...
Bug: http://b/26548285
Change-Id: I20ae75c4ec2dc64b982a047dba498ebda029c90d
2016-04-27 17:40:11 -07:00
Elliott Hughes
2f1eedded8
Merge "Update recovery UI." into nyc-dev
2016-04-28 00:31:21 +00:00
Tianjie Xu
a15708f45b
Update background text for recovery UI
...
Pull in new translations and regenerate the background strings for
recovery UI.
Bug:27837319
Bug:26548285
Change-Id: I274938a5039421b947878da82336443e9647df24
2016-04-27 15:30:54 -07:00
Baligh Uddin
158c39011d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours
...
am: a42bca8 -s ours
* commit 'a42bca855509b3360cdf42a1f5677682d1d074b6':
Change-Id: I80a1b3a9693ce901bd3c0cf1149a562b8addeedb
2016-04-27 22:25:25 +00:00
Baligh Uddin
42e6053970
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours
...
am: 06be362 -s ours
* commit '06be362ec79fb26658c3afca710c7d11df5f23de':
Import translations. DO NOT MERGE
Change-Id: Idd0e7153210df855be92d788c6a0d90222f69826
2016-04-27 22:17:29 +00:00
Baligh Uddin
06be362ec7
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 47a7899 -s ours
* commit '47a78999ea8719359bf704db3bbe96db214d51fd':
Import translations. DO NOT MERGE
Change-Id: Ica60c273aaf6466250078ee0051278060a0aa650
2016-04-27 22:04:19 +00:00
Baligh Uddin
a42bca8555
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 47a7899 -s ours
* commit '47a78999ea8719359bf704db3bbe96db214d51fd':
Import translations. DO NOT MERGE
Change-Id: If34b4be21c2bb75300c5aaf9fd1ef03a22a5f001
2016-04-27 22:04:19 +00:00
Elliott Hughes
faf36e04ed
Update recovery UI.
...
* Use new animation.
* Use new non-holo progress bars.
* Use recommended spacing for recovery UI.
Bug: http://b/26548285
Change-Id: I8411e89d6a6a9ce638b8645e19e5082d0d968cee
2016-04-27 14:46:01 -07:00
Baligh Uddin
da5daabcae
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: abd0988 -s ours
* commit 'abd098801198a696914e4d2ccaae95ed9fa3f944':
Import translations. DO NOT MERGE
Change-Id: Ib7ea003744e6691aacdb365126784e50d5eaf2a4
2016-04-27 21:42:29 +00:00
Baligh Uddin
47a78999ea
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-04-27 21:18:01 +00:00
Baligh Uddin
abd0988011
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-04-27 21:17:58 +00:00
Bill Yi
f1d2140d1a
Import translations. DO NOT MERGE am: ca5003e -s ours
...
am: 97ee2b1 -s ours
* commit '97ee2b1fbec2735bc54877f907447e0047aa07b6':
Change-Id: I22fda6dc0d92828b8331dbac473264d0f2295b0c
2016-04-26 23:26:01 +00:00
Bill Yi
0bc96a736a
Import translations. DO NOT MERGE am: ca5003e -s ours
...
am: e84e73a -s ours
* commit 'e84e73a0187027e559871ae72e33bce8986c2be8':
Import translations. DO NOT MERGE
Change-Id: Id7c1a715d5dd776cb41bdd52f8097159670a6b63
2016-04-26 23:22:42 +00:00
Bill Yi
97ee2b1fbe
Import translations. DO NOT MERGE
...
am: ca5003e -s ours
* commit 'ca5003e0336ebe4b8260172ed8183c5ae9095018':
Import translations. DO NOT MERGE
Change-Id: I0a499ffbafa52d0bc9f2a4654ea250c9fa0263ed
2016-04-26 22:52:09 +00:00
Bill Yi
e84e73a018
Import translations. DO NOT MERGE
...
am: ca5003e -s ours
* commit 'ca5003e0336ebe4b8260172ed8183c5ae9095018':
Import translations. DO NOT MERGE
Change-Id: I51c2cfd99a9c6d25cd3da1344229dba7885cc101
2016-04-26 22:48:43 +00:00
Bill Yi
c9890bf5b2
Import translations. DO NOT MERGE
...
am: a004356 -s ours
* commit 'a00435652a8f922cd09cef1ef38fa39c93c3f2c4':
Import translations. DO NOT MERGE
Change-Id: I819d91029945fb4594d9b9e84b5a43e06c2bbb71
2016-04-26 22:17:05 +00:00
Bill Yi
a00435652a
Import translations. DO NOT MERGE
...
Change-Id: Id48a7d573bdfd417975bb1054eb6a2453a151bf8
Auto-generated-cl: translation import
2016-04-26 15:06:53 -07:00
Bill Yi
ca5003e033
Import translations. DO NOT MERGE
...
Change-Id: I3383f51c68573c3e350f1bad5fce90be5643edb0
Auto-generated-cl: translation import
2016-04-26 15:04:31 -07:00
Baligh Uddin
9f5565bd10
Import translations. DO NOT MERGE
...
Change-Id: Idd1fdeee52a77d6fb4ecc271b6fdfc41e62b2bd0
Auto-generated-cl: translation import
2016-04-26 13:38:33 -07:00
Baligh Uddin
4315841f74
Import translations. DO NOT MERGE
...
Change-Id: I2c06d0cb0aa43c69f4f4b8c0ce6f7a81dbd00dba
Auto-generated-cl: translation import
2016-04-26 13:35:32 -07:00
Bill Yi
fc5ac34867
Import translations. DO NOT MERGE am: e59f5de -s ours
...
am: 29c7a34 -s ours
* commit '29c7a347b92cc4696ac89248f03228944a57673f':
Change-Id: I428ab05040ef8033999a6cf3cf21107a073c7c69
2016-04-25 13:04:11 +00:00
Bill Yi
c27646f9f1
Import translations. DO NOT MERGE am: e59f5de -s ours
...
am: d210dc0 -s ours
* commit 'd210dc0478131a8537dbd853e678707fd9e09587':
Import translations. DO NOT MERGE
Change-Id: If01820901a4fe03a96a5d11a5c439ac40fef5e35
2016-04-25 12:58:41 +00:00
Bill Yi
29c7a347b9
Import translations. DO NOT MERGE
...
am: e59f5de -s ours
* commit 'e59f5de5772f16a9969d655d5b184d0f75d664b9':
Import translations. DO NOT MERGE
Change-Id: Ib918ef5f3fdf97363c2d7449c0412e8b3ce87b34
2016-04-25 12:53:24 +00:00
Bill Yi
d210dc0478
Import translations. DO NOT MERGE
...
am: e59f5de -s ours
* commit 'e59f5de5772f16a9969d655d5b184d0f75d664b9':
Import translations. DO NOT MERGE
Change-Id: I06b45f12e41dff2da3d4538cbf35203008372cea
2016-04-25 12:53:24 +00:00
Bill Yi
e59f5de577
Import translations. DO NOT MERGE
...
Change-Id: I9706fca12f3c0a19019c41ba0eaf395ac53ba0b1
Auto-generated-cl: translation import
2016-04-24 22:28:28 -07:00
Tao Bao
a28617a2dc
Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089
...
am: 2f9be55
* commit '2f9be5517225b33be30f48630ba581087672ea75':
Change-Id: I4ebadf342f35f4a06af84d2c437f21526a4949c8
2016-04-23 00:01:03 +00:00
Tao Bao
4dc24a5bf4
Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089
...
am: 5e3aa78
* commit '5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be':
recovery: Dump the signature in the zip package.
Change-Id: I44b52bfe8b2ad3e66f0f393784494a45652ee343
2016-04-22 23:56:20 +00:00
Tao Bao
2f9be55172
Merge "recovery: Dump the signature in the zip package." into nyc-dev
...
am: 34ca089
* commit '34ca0892f4ae440becbe8097e7b68cd5a6d494d3':
recovery: Dump the signature in the zip package.
Change-Id: I674e1a43aafe0140371b123bb7e14fc928c43988
2016-04-22 23:49:58 +00:00
Tao Bao
5e3aa78c8b
Merge "recovery: Dump the signature in the zip package." into nyc-dev
...
am: 34ca089
* commit '34ca0892f4ae440becbe8097e7b68cd5a6d494d3':
recovery: Dump the signature in the zip package.
Change-Id: I22eb6256f3204f2eac80e729cd0cd5b862b45863
2016-04-22 23:49:53 +00:00
Tao Bao
34ca0892f4
Merge "recovery: Dump the signature in the zip package." into nyc-dev
2016-04-22 23:36:50 +00:00
Android Build Merger (Role)
9ac7ff6b3c
Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp
2016-04-21 23:18:40 +00:00
Elliott Hughes
cf05e364e7
Go back to the old ear-wiggling Android animation. am: 692941be79
...
am: 87b0654f00
* commit '87b0654f00d84b91cb42289a6229a8682831ed41':
Go back to the old ear-wiggling Android animation.
Change-Id: I0d87c52b7ecbf0488460045e1223011970ce3ce7
2016-04-21 23:18:35 +00:00
Elliott Hughes
43ce00e737
Go back to the old ear-wiggling Android animation. am: 692941be79
...
am: 17266d9a65
* commit '17266d9a653d8b896dfe6d69826e28352d5932bd':
Go back to the old ear-wiggling Android animation.
Change-Id: I7d6596e64dab3ee5ef92cc95237f89f4fbf037a2
2016-04-21 23:18:34 +00:00
Elliott Hughes
17266d9a65
Go back to the old ear-wiggling Android animation.
...
am: 692941be79
* commit '692941be79fd765f8873d810ae627a917dfd791b':
Go back to the old ear-wiggling Android animation.
Change-Id: Ifddb21173e55f9c690dbc0661308575d885f4e76
2016-04-21 23:16:20 +00:00
Elliott Hughes
87b0654f00
Go back to the old ear-wiggling Android animation.
...
am: 692941be79
* commit '692941be79fd765f8873d810ae627a917dfd791b':
Go back to the old ear-wiggling Android animation.
Change-Id: I7258a81b7068a98d005b98bd4c2bbad38485366d
2016-04-21 23:16:19 +00:00
Elliott Hughes
692941be79
Go back to the old ear-wiggling Android animation.
...
But keep the new code so we can easily test new animations when we have them.
This change includes tbao's de-interlace script, plus a one-liner that's
necessary to play the animation at the correct speed when there's no
progress bar showing. (This was always a bug, it's just way more noticeable
when your animation only has 7 frames.)
Bug: http://b/28316654
Bug: http://b/26548285
Change-Id: I32c601c352d6be235d1b44f14fca7e125defd77d
2016-04-21 14:26:14 -07:00
Android Build Merger (Role)
99f55506c5
Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp
2016-04-21 01:08:08 +00:00
Tianjie Xu
d24d9e4944
Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512
...
am: 8bb3bd9209
* commit '8bb3bd9209f117ea6e3a0560b3c58334ea9fd2c4':
Regenerate background text imgs in recovery
Change-Id: If3d6ee82ccedbdf5856e49795633622e723b604e
2016-04-21 01:08:00 +00:00