Commit Graph

2172 Commits

Author SHA1 Message Date
Matt Sarett bd43d7e92b resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392
am: 75dea9ca3a

* commit '75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1':
  DO NOT MERGE Use updated libpng API

Change-Id: I75e0414350115ec133d9905263c01c3b385512b3
2016-05-19 23:28:20 +00:00
Matt Sarett 75dea9ca3a resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1
am: b02b2fe392

* commit 'b02b2fe392827a423c7783522edc5b9ad3d4f130':
  DO NOT MERGE Use updated libpng API

Change-Id: Ie6e8c5118687f0d34fc4acffdcb1d784e71e411f
2016-05-19 23:25:43 +00:00
Matt Sarett b02b2fe392 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d
am: fc1d9a49d1

* commit 'fc1d9a49d1e33c133c96cf6b04d6f47d3cfaa496':
  DO NOT MERGE Use updated libpng API

Change-Id: Id9da4d3980f394bf19032581629d0baf9c30e0fc
2016-05-19 23:22:55 +00:00
Matt Sarett fc1d9a49d1 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55
am: 300af0779d

* commit '300af0779de3c2658f32e3de40adc41dae92df1e':
  DO NOT MERGE Use updated libpng API

Change-Id: Iac60caa51e747fcde2c08ddf06323e8b1e98f36a
2016-05-19 23:20:22 +00:00
Matt Sarett 300af0779d resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad
am: aa02888e55

* commit 'aa02888e55147ec78fa5636a87e2447bda136d68':
  DO NOT MERGE Use updated libpng API

Change-Id: I10705dd579623e4b208093cfc4839aad496081c8
2016-05-19 23:17:52 +00:00
Matt Sarett aa02888e55 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27
am: 8a1d4e97ad

* commit '8a1d4e97ad3b748a06db618f9d7ccf5114ea16d0':
  DO NOT MERGE Use updated libpng API

Change-Id: I09e8917976c05beec8bf881140539948c323ce58
2016-05-19 23:14:39 +00:00
Matt Sarett 8a1d4e97ad resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630
am: ca45737e27

* commit 'ca45737e272aeefd657451a6faaa088d1903378c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ia9c36583c9d60d01fec7ee9aefc973dabb1c07d3
2016-05-19 23:12:10 +00:00
Matt Sarett ca45737e27 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e
am: 1f814d7630

* commit '1f814d7630c56cc9e825ed411e068414c97acb6c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ib381e8ccefe9181911a2144d7255ecadefb42b5c
2016-05-19 23:08:54 +00:00
Matt Sarett 1f814d7630 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f
am: 36acff7d7e

* commit '36acff7d7e88549bbeab6a08488ab48596d7fbc5':
  DO NOT MERGE Use updated libpng API

Change-Id: I7f01d932235ef69640ed4859d0e62344b3b774de
2016-05-19 23:06:06 +00:00
Matt Sarett 36acff7d7e resolve merge conflicts of 86a28d0 to klp-modular-dev
am: a5bc59620f

* commit 'a5bc59620fd43c99621eb98ac84cbeea867d0c93':
  DO NOT MERGE Use updated libpng API

Change-Id: I3d8d27b08fd1fd89c6b8d9c39b883a45aecb83ce
2016-05-19 23:03:35 +00:00
Matt Sarett a5bc59620f resolve merge conflicts of 86a28d0 to klp-modular-dev
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
2016-05-19 15:47:25 -04:00
Matt Sarett 86a28d0aaf DO NOT MERGE Use updated libpng API
am: 839b4e592a

* commit '839b4e592a7c81bdebe08fae4eef6e909c89acd6':
  DO NOT MERGE Use updated libpng API

Change-Id: I7bbece70a4129554d953fd22c71527b2ca11262e
2016-05-19 19:26:12 +00:00
Tianjie Xu 027b403e8a Add time and I/O info to last_install
am: dd874b1c87

* commit 'dd874b1c87eb04f28db0db2629df0adde568a74c':
  Add time and I/O info to last_install

Change-Id: I487bdc54897816fe8ed24b441a848cac1dc29389
2016-05-18 18:44:31 +00:00
Matt Sarett 839b4e592a DO NOT MERGE Use updated libpng API
BUG:23265085
Change-Id: Ibc521fae11dad22283d8469329326ef79525b414
2016-05-17 20:28:54 +00:00
Tianjie Xu dd874b1c87 Add time and I/O info to last_install
One example of last_install is:

/sideload/package.zip
1
time_total: 101
bytes_written_system: 14574000
bytes_stashed_system: 100
bytes_written_vendor: 5107400
bytes_stashed_vendor: 0

Bug: 28658632
Change-Id: I4bf79ea71a609068d38fbce6b41bcb892524aa7a
2016-05-16 14:54:37 -07:00
Tianjie Xu ba4e7977e4 Make text for recovery larger on angler
am: 087c5edd8d

* commit '087c5edd8dc1e7d46a38ff2df220c29e96b17a1b':
  Make text for recovery larger on angler

Change-Id: I54421156aa6c261e9aa8a68fade71eebb5ed95fa
2016-05-02 19:34:00 +00:00
Tianjie Xu 087c5edd8d Make text for recovery larger on angler
Change the link for 560dpi to xxxhdpi from xxhdpi.

Bug: 22465983
Change-Id: I7141ee568cf3e73cdc7e0de986d705c19ac53b1f
2016-05-02 12:20:04 -07:00
Tianjie Xu 23c7af797a Merge "Add ability to show "installing security update"" into nyc-dev
am: 5823dd46df

* commit '5823dd46df9667c43e8fc3f5ff79987b7432da3f':
  Add ability to show "installing security update"

Change-Id: Ibe1667e9bd721d73a972f9c21a322c8ea088dc63
2016-05-02 17:47:52 +00:00
Tianjie Xu 5823dd46df Merge "Add ability to show "installing security update"" into nyc-dev 2016-05-02 17:38:17 +00:00
Tao Bao f13662a349 recovery: Always log the update attempt.
am: 5687001895

* commit '568700189528c69a6cdd7a246127ce01463e033d':
  recovery: Always log the update attempt.

Change-Id: I48f3199c4640a17ae022879082f8de9948d94925
2016-05-02 16:32:41 +00:00
Tao Bao 5687001895 recovery: Always log the update attempt.
An OTA may be skipped due to low battery. But we should always log it to
understand why an update _fails_ to apply.

Bug: 27893175
Change-Id: I50a3fbbb3e51035e0ac5f1cca150e283852825c3
2016-04-29 15:41:25 -07:00
Tianjie Xu 35926c4b89 Add ability to show "installing security update"
Add a new command "--security" to boot commands. If this command is
observed as part of BCB, choose a different background text picture
for installing stage in recovery UI. As a result, users will see
"installing security update" instead of "installing system update"
when applying a security update package.

Bug: 27837319
Change-Id: I2e2253a124993ecc24804fa1ee0b918ac96837c5
2016-04-29 12:19:43 -07:00
Elliott Hughes a7f7e7093e Merge "Improve the layout-related comments." into nyc-dev
am: 343eb72

* commit '343eb722ddd0146e5c752419b3ff9537cfa2d31d':
  Improve the layout-related comments.

Change-Id: Ia765c16883d92c6a00846413e8ada372952e8cbf
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 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 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 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 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 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 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 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 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 34ca0892f4 Merge "recovery: Dump the signature in the zip package." into nyc-dev 2016-04-22 23:36:50 +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 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 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