Commit Graph

2397 Commits

Author SHA1 Message Date
Android Build Merger (Role) 805292f764 Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp 2016-05-02 19:38:36 +00:00
Tianjie Xu 1c93e2e6cf Make text for recovery larger on angler am: 087c5edd8d
am: ba4e7977e4

* commit 'ba4e7977e4bcf382eb0cd4e6fa6ca44febe13f83':
  Make text for recovery larger on angler

Change-Id: I2ae25767e5d3fec45068f04398a8052c9b8cb821
2016-05-02 19:38:23 +00:00
Tianjie Xu 4a5213e8ee Make text for recovery larger on angler am: 087c5edd8d
am: 26f5ab0e9c

* commit '26f5ab0e9c4ca93ae461b7284d15bb25da18f084':
  Make text for recovery larger on angler

Change-Id: I5e34aa115fc1c3f82a8d40146286bf52dc31fc2e
2016-05-02 19:38:23 +00: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 26f5ab0e9c Make text for recovery larger on angler
am: 087c5edd8d

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

Change-Id: I3b56dff9acced0b355643042a0dffb28bd88d6d2
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 b5de6a20a7 resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp
am: cacb47b2a3

* commit 'cacb47b2a38a84eaae94dd10857a83b7c6b1885e':

Change-Id: Icdaf7e9132e807ae9a7076b92b91bae8632269ec
2016-05-02 18:27:24 +00:00
Tianjie Xu 70b5353274 resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp
Change-Id: I04a73db90ddb059dbb5b44fafd8e82d03ea90ca5
2016-05-02 11:17:57 -07:00
Tianjie Xu cacb47b2a3 resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp
Change-Id: I4ec33904a6af38d81b422c7be6f40b828fbc7525
2016-05-02 18:09:26 +00: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
Android Build Merger (Role) ce7c6ff48e Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp 2016-05-02 16:37:12 +00:00
Tao Bao 41584111b5 recovery: Always log the update attempt. am: 5687001895
am: e0c8a9bb02

* commit 'e0c8a9bb02d4518c0723ea56b02da51373ddb5e9':
  recovery: Always log the update attempt.

Change-Id: I02178398bd8bbee8c106320a9e9564bedd19c97a
2016-05-02 16:37:01 +00:00
Tao Bao 07fe1c6696 recovery: Always log the update attempt. am: 5687001895
am: f13662a349

* commit 'f13662a349cd625504bacfe82a9696a3ead726ec':
  recovery: Always log the update attempt.

Change-Id: I8d111ff9bf410d87e957d6a475c319abba5c7489
2016-05-02 16:37:01 +00:00
Tao Bao e0c8a9bb02 recovery: Always log the update attempt.
am: 5687001895

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

Change-Id: Ibf0d564c26bb5045fe24466a415dea13cd3a5a18
2016-05-02 16:32:41 +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
Chih-Hung Hsieh ac7d8f278b Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a
am: 8d3b85a320

* commit '8d3b85a32005df441ae0afde7b9f924824f1446e':
  Fix google-explicit-constructor warnings.

Change-Id: I1eac3384574974067701031b952e9a59aac81ba7
2016-04-29 22:36:10 +00:00
Chih-hung Hsieh 8d3b85a320 Merge "Fix google-explicit-constructor warnings." am: fafa6a6531
am: 77d7cb1d0a

* commit '77d7cb1d0ab56a726af4b8e07753c8d4c4f65c25':
  Fix google-explicit-constructor warnings.

Change-Id: Iccde2abd9bf0c35c36a1856c7a02207314af466f
2016-04-29 22:33:51 +00:00
Chih-Hung Hsieh 77d7cb1d0a Merge "Fix google-explicit-constructor warnings."
am: fafa6a6531

* commit 'fafa6a65314a5550a045c96768f595567db7bc2d':
  Fix google-explicit-constructor warnings.

Change-Id: Ie13217c835f3b092440e913c407ad5b63b2edcb9
2016-04-29 22:31:39 +00:00
Chih-hung Hsieh fafa6a6531 Merge "Fix google-explicit-constructor warnings." 2016-04-29 22:26:41 +00:00
Chih-Hung Hsieh 49c5c79df1 Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I5b35ae16c069e7e9229e66963386f322bd808af1
2016-04-29 14:16:35 -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
Tao Bao 187e7c7ab0 Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e
am: 6bfe76e

* commit '6bfe76e1fefa7fd4c8f1accb9d8959e382ba7bae':
  updater: Don't zero out CommandParameters with memset(3).

Change-Id: I057454ed02d17b3fec2fbb4a653b4aedeeee2a43
2016-04-28 04:42:11 +00:00
Tao Bao 6bfe76e1fe Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee
am: 4458d3e

* commit '4458d3e552736facb7b9cd832744d8d47325b4a3':
  updater: Don't zero out CommandParameters with memset(3).

Change-Id: Icc996f7c038a1eb9f861108fffc55e552aa0c42c
2016-04-28 04:39:12 +00:00
Tao Bao 4458d3e552 Merge "updater: Don\'t zero out CommandParameters with memset(3)."
am: df59cee

* commit 'df59ceecfb939c02593425a89757b54c50cc91cf':
  updater: Don't zero out CommandParameters with memset(3).

Change-Id: I36d1395257da1d122e76f8552bb3a2a8f96f60b7
2016-04-28 04:36:12 +00:00
Tao Bao df59ceecfb Merge "updater: Don't zero out CommandParameters with memset(3)." 2016-04-28 04:28:19 +00:00
Android Build Merger (Role) 3a6c28f1f8 Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp 2016-04-28 02:43:43 +00:00
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
TreeHugger Robot ed5b648c0e Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
am: a7f7e70

* commit 'a7f7e7093ea67c3ddda03f52edb440c780d69b0d':
  Improve the layout-related comments.

Change-Id: I957cc75b064b1d0be5cee54af7b27f008a7a22a1
2016-04-28 02:43:30 +00: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
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 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 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 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