Commit Graph

2425 Commits

Author SHA1 Message Date
Bill Yi 846dca9c5d Import translations. DO NOT MERGE am: e59f5de -s ours am: d210dc0 -s ours
am: c27646f  -s ours

* commit 'c27646f9f1633797be018001f6c04faab8bdb515':
  Import translations. DO NOT MERGE

Change-Id: Ibeff8dbd04c90fd00671ed75a6092f86efada6fa
2016-04-25 13:03:53 +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 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
Bill Yi 3470fea07d Import translations. DO NOT MERGE
Change-Id: Ice2fc6151b69ad3a4029184a5afa6020085219f2
Auto-generated-cl: translation import
2016-04-24 20:56:43 -07:00
Tao Bao deea2dff25 Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 2f9be55
am: a28617a

* commit 'a28617a2dccfeda98fc3449b94c270cedd84aa7b':

Change-Id: I06dcb597c0bdd3013c54f4bb1a6bbbb6ff0656f2
2016-04-23 00:08:10 +00:00
Tao Bao e93c43fc66 Merge "recovery: Dump the signature in the zip package." into nyc-dev am: 34ca089 am: 5e3aa78
am: 4dc24a5

* commit '4dc24a5bf4b1141db6888c474ebfd225bf69060c':
  recovery: Dump the signature in the zip package.

Change-Id: Ied1045a42aeeb1e6a0951189a8db2d35a68f47c3
2016-04-23 00:08:10 +00: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
Elliott Hughes ba2d86ee1f Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp
am: 9ac7ff6b3c

* commit '9ac7ff6b3cfcbe981b30ea35c660b82872203039':

Change-Id: I3f03c5e2ff82a5de7dbf0843f014d7dc47b23290
2016-04-21 23:20:51 +00:00
Elliott Hughes d134504db9 Go back to the old ear-wiggling Android animation. am: 692941be79 am: 17266d9a65
am: 43ce00e737

* commit '43ce00e7375fae5db66177552f973e317e6b7318':
  Go back to the old ear-wiggling Android animation.

Change-Id: I24342c0d5f690fbc0b33dc6cdea42324376c6066
2016-04-21 23:20: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
Tianjie Xu f6326bbfc1 Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp
am: 99f55506c5

* commit '99f55506c5c6b911ea6ece02a9d654af06349948':

Change-Id: I0a726788735a9be239aa36cc7a6363accda7ba51
2016-04-21 01:59:10 +00:00
Tianjie Xu ce18b61f9b Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 8bb3bd9209
am: d24d9e4944

* commit 'd24d9e494429d74089a2060e7500d52fd9b10f7c':
  Regenerate background text imgs in recovery

Change-Id: I28f312bdfc24f3de0ea8fd3794f3e8e6c507158b
2016-04-21 01:59:10 +00: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
Tianjie Xu 76734915c7 Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512
am: 4cc6145423

* commit '4cc61454239cd053e9d12e8de6df2878d30b9c72':
  Regenerate background text imgs in recovery

Change-Id: I64145a026a91cddea95dec604fdbfe0abd03de55
2016-04-21 01:08:00 +00:00
Tianjie Xu 8bb3bd9209 Merge "Regenerate background text imgs in recovery" into nyc-dev
am: df093c1512

* commit 'df093c15121df40693519d2a1c703cf1684423d5':
  Regenerate background text imgs in recovery

Change-Id: Ie70920503c5361c925cdaa55852e456fbd8830a7
2016-04-21 01:05:47 +00:00
Tianjie Xu 4cc6145423 Merge "Regenerate background text imgs in recovery" into nyc-dev
am: df093c1512

* commit 'df093c15121df40693519d2a1c703cf1684423d5':
  Regenerate background text imgs in recovery

Change-Id: If4c878b2ffd03189107ed24e1cd3e9e88833024c
2016-04-21 01:05:46 +00:00
Tianjie Xu df093c1512 Merge "Regenerate background text imgs in recovery" into nyc-dev 2016-04-21 00:55:51 +00:00
Tianjie Xu f986f57b22 Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5
am: d32182d

* commit 'd32182da0014b52cf23cc5865d7465b6eda99e6a':

Change-Id: I1adf6606782eb844d5993709715e463d3bb6efdf
2016-04-20 23:56:55 +00:00
Tianjie Xu d32182da00 Merge "Fix matches_locale function" into nyc-dev am: 8b86373
am: 210b0a5

* commit '210b0a5a20830beea3b3e96e84c6b3fd2a626cf5':

Change-Id: I0ead2ccee7d8a2db4a2ac585a2054ee80abd569c
2016-04-20 23:26:00 +00:00
Tianjie Xu 07c9edb263 Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 45609d3
am: 9eeeb17

* commit '9eeeb17e05e5a44c582dc58e30f12bf0c20517ff':
  Fix matches_locale function

Change-Id: I765e6c00abeebc608298e1971b995de10c3ef830
2016-04-20 22:52:05 +00:00
Tianjie Xu 9eeeb17e05 Merge "Fix matches_locale function" into nyc-dev am: 8b86373
am: 45609d3

* commit '45609d37efe3ced3a599b6eccd6e6dbd184152e6':
  Fix matches_locale function

Change-Id: I3f3a41dbcb4ab42d287f36b6ff0f2eaa6806f99a
2016-04-20 22:30:13 +00:00
Tianjie Xu 45609d37ef Merge "Fix matches_locale function" into nyc-dev
am: 8b86373

* commit '8b86373fd954276b18a6fba81afbe42c9caa49d3':
  Fix matches_locale function

Change-Id: If7726c2f381ba0e4ab0519b77c167e75a9d46104
2016-04-20 22:12:11 +00:00
Tianjie Xu 210b0a5a20 Merge "Fix matches_locale function" into nyc-dev
am: 8b86373

* commit '8b86373fd954276b18a6fba81afbe42c9caa49d3':
  Fix matches_locale function

Change-Id: I9494f416b12cba3c63972096137ddaf805bc453b
2016-04-20 22:12:11 +00:00
Tianjie Xu 8b86373fd9 Merge "Fix matches_locale function" into nyc-dev 2016-04-20 21:55:30 +00:00
Tianjie Xu 2430e2978b Fix matches_locale function
matches_locale was expecting input locale string to have at most one
underscore; as a result "zh_CN_#Hans" ignores "zh_CN" and matches into
"zh". Fix the match function and add unit tests.

Bug: 27837319
Change-Id: I4e8a66f91cae6ac2a46b6bf21f670d5ea564c7c8
2016-04-20 14:50:35 -07:00
Tao Bao e179276f7d recovery: Dump the signature in the zip package.
We have been occasionally seeing "signature verification failed" error
message when applying an update. Make more verbose output to help
debugging.

Bug: 28246534
Change-Id: Id83633adc9b86b3fd36abbb504e430f0816f12e4
2016-04-20 14:44:29 -07:00
Elliott Hughes 2efbd3b879 Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp
am: 07f0912

* commit '07f0912fe6bd5d4971ceb497e9b921ce20e6d9db':

Change-Id: I5560b9d38eff7995047d08a9d81736148710eebe
2016-04-20 15:28:09 +00:00
Elliott Hughes b7f24f5f87 Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp
am: f39da4f

* commit 'f39da4fc1b84c594d95b241d75eec1b25f7d4480':
  Remove trailing punctuation from recovery strings.

Change-Id: I8858b1097b301b612494801cce4c2ad3274823dc
2016-04-20 15:28:09 +00:00
Elliott Hughes 2d7c1515cd Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp
am: 2103472

* commit '2103472898e3a58efb52c778a7c41df9c5b0d7a3':

Change-Id: I12be28a8544dc4535ada80cdf9ce94397292bfcb
2016-04-20 15:28:08 +00:00
Elliott Hughes 202214c4d5 Decrease OTA package verification times further. am: dd895d0 am: 1864feb
am: 576fb11

* commit '576fb1145bbca145502773443d13751dd45d6fe5':
  Decrease OTA package verification times further.

Change-Id: I9aa5ca50bf8a73863068eac44c66951a9f1a5754
2016-04-20 15:28:08 +00:00
Android Build Merger (Role) 07f0912fe6 Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp 2016-04-20 15:25:18 +00:00
Android Build Merger (Role) f39da4fc1b Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: c15177b" into nyc-mr1-dev-plus-aosp 2016-04-20 15:25:17 +00:00
Android Build Merger (Role) 2103472898 Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp 2016-04-20 15:25:15 +00:00
Elliott Hughes 9552397004 Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d
am: c15177b

* commit 'c15177b8b8f125c0c86bd7dabacde1289e68c45e':
  Remove trailing punctuation from recovery strings.

Change-Id: I2518baa5eb2be33da5f86d92e33b88a402724209
2016-04-20 15:25:07 +00:00
Elliott Hughes 576fb1145b Decrease OTA package verification times further. am: dd895d0
am: 1864feb

* commit '1864feb8d2ab6f764d377df28613a973927d85e8':
  Decrease OTA package verification times further.

Change-Id: I0e2eb49ed48081f93bc0c42eeb64aef356912260
2016-04-20 15:25:06 +00:00
Elliott Hughes 5f86a2e627 Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d
am: 0e52921

* commit '0e5292104b515d7eb9976b7d5c9e8c5e8a04a30d':
  Remove trailing punctuation from recovery strings.

Change-Id: I0bc91e855be85bbc26d4230ebc80d7d7115941ec
2016-04-20 15:25:06 +00:00
Elliott Hughes 984e81a599 Decrease OTA package verification times further. am: dd895d0
am: 5be36da

* commit '5be36da6518cc0707e8cdcdc6382999efcf70f17':
  Decrease OTA package verification times further.

Change-Id: I27c2b1ff7c8ab415c4b6e1c5b903b0a5b5ad57cb
2016-04-20 15:25:06 +00:00
Elliott Hughes c15177b8b8 Merge "Remove trailing punctuation from recovery strings." into nyc-dev
am: 4eec72d

* commit '4eec72d2cf8c1be0068feffc804035dab756c78d':
  Remove trailing punctuation from recovery strings.

Change-Id: I60cf10d7748227d81f60fc9d1fe18cdb01f8b2f3
2016-04-20 15:21:35 +00:00
Elliott Hughes 0e5292104b Merge "Remove trailing punctuation from recovery strings." into nyc-dev
am: 4eec72d

* commit '4eec72d2cf8c1be0068feffc804035dab756c78d':
  Remove trailing punctuation from recovery strings.

Change-Id: If9529323c0933f88f8d28a450589d2864af19ad2
2016-04-20 15:21:34 +00:00