Commit graph

182 commits

Author SHA1 Message Date
Tianjie Xu
b97f7e5343 image generator: format the java file
Format the file with google-java-format --aosp. This makes the presubmit
hook happy.

Bug: 74397117
Test: mma
Change-Id: Ie342ed11449414b63f2d1ae781023e940b136bcb
2018-11-13 20:29:16 +00:00
Bill Yi
f560a89470 Import translations. DO NOT MERGE
Change-Id: I1bd6d7f12c7bfffb7e022f09347a5be5a96766a3
Auto-generated-cl: translation import
2018-11-13 08:09:37 -08:00
Tao Bao
cf2a142c43 Merge changes If24c6b7c,I381b0103 am: 67b7e64034 am: aeda63b106
am: afad7170bb

Change-Id: I1f715c5de7c19514c5f9b5d62014bcf5ddb80598
2018-11-06 14:23:30 -08:00
Tao Bao
529bb742b7 image_generator: Fix the warnings on import order.
[platform/bootable/recovery] tools/image_generator/ImageGenerator.java:36: Wrong order for java.util.StringTokenizer import. Use Ctrl+Shift+O (Eclipse) or Ctrl+Alt+O (Intellij) to sort imports. https://source.android.com/setup/code-style#order-import-statementsERRORS:
[platform/bootable/recovery] tools/image_generator/ImageGenerator.java:43: Wrong order for org.apache.commons.cli.CommandLine import. Use Ctrl+Shift+O (Eclipse) or Ctrl+Alt+O (Intellij) to sort imports. https://source.android.com/setup/code-style#order-import-statementsERRORS:
[platform/bootable/recovery] tools/image_generator/ImageGenerator.java:50: Extra separation in import group before 'org.w3c.dom.Document'

Test: `mmma -j bootable/recovery`
Test: `repo upload` no longer gives warnings.
Change-Id: If24c6b7ca33b9223b3e326a48885c24c35b5fa68
2018-11-06 11:34:31 -08:00
Tianjie Xu
59d0c1df0a Merge "Make the text image readable under recovery" am: d84922216c am: d50aa4f4ee
am: 69067f1946

Change-Id: I3ed6dc0ce70a8b859bd703cd7a322ee899f8e647
2018-11-04 23:06:54 -08:00
Tianjie Xu
22dd019aa5 Make the text image readable under recovery
Encode the width, height and locale of the localized image as pixels so
that recovery can locate the correct range of the image from a
concatenated png file.

Also address a few todoes including wrapping the CJK text, making a
catch-all type for all languages.

Test: view the generated image under locale test
Change-Id: Icd3997eb4e992e76ef72526787d64c406f606970
2018-11-01 15:57:31 -07:00
Bill Yi
df115ad537 Import translations. DO NOT MERGE
Change-Id: Icfe0dc21567e74da70cc7b2f1229815bceeac958
Auto-generated-cl: translation import
2018-10-30 19:01:50 -07:00
Tianjie Xu
d84d570d8c Merge "Add description for the new translation" 2018-10-30 03:00:47 +00:00
Tianjie Xu
9f843e7751 Add description for the new translation
As we localize the wipe data menu under the recovery mode, some
additional strings need the new translation. The strings include
1. The menu header that prompts a data wipe
2. Try again description
3. Factory reset description
4. The menu header to confirm a data wipe
5. Cancel description

We will resue the "Factory reset description" in the confirmation menu;
and the image_generator tool will be moved to this directory in later
cls.

Bug: 74397117
Test: mma
Change-Id: I706b8677dba506b62e890f6b200e3eb3b11ce483
2018-10-29 14:43:44 -07:00
Tianjie Xu
aeec0b2076 Delete the dumpkey host tool
We used to dump the public key files into some text format; and parse
them under recovery. But now we have switched to read the certificates
directly from the zip files; and there's no caller of this dumpkey host
tool any more.

Bug: 116655889
Test: mma
Change-Id: I115592e2a894b3375495c81cb249d1bed1a5d973
2018-10-29 11:14:09 -07:00
Tianjie Xu
edfeb97f9f Switch to use commandline parser
The commandline parser adds some flexibility to the argument parsing. It
also makes the help message more descriptive.

Bug: 74397117
Test: generate a image, checks the help message
Change-Id: Ib238658a9a6fa8806f1b0dde419c8fb970e7cb37
2018-10-29 11:01:36 -07:00
Tianjie Xu
721f6792b4 Use a host java program to generate the background text
This program uses java.awt.Graphics2D to generate the background text
files used under recovery mode. And thus we don't need to do the manual
work by running emulators with different dpi.

The program takes the following parameters:
1. imageWidth: The number of pixels per line; and the text strings will be
   wrapped accordingly.
2. textName: The description of the text string, e.g. "recovery_erasing",
   "recovery_installing_security"
3. fontDirectory: The directory that contains all the support .ttf | .ttc
   files, e.g. $OUT/system/fonts/
4. resourceDirectory: The resource directory that contains all the translated
   strings in xml format, e.g. bootable/recovery/tools/recovery_l10n/res/
5. outputFilename: Path to the generated image.

Bug: 74397117
Test: checks the generated png files
Change-Id: Ia5506a0a4f5da1ebfd7090345eb246f44b265075
2018-10-12 15:46:32 -07:00
Tao Bao
f91fdfb3fc Merge "tools: Move to Soong." am: 6b16093b29
am: 9016deefe4

Change-Id: I1c8b1dd470279e3e5b8ca15c76dfe09691257bd6
2018-05-29 11:09:10 -07:00
Tao Bao
e462cdffe9 tools: Move to Soong.
Test: `mmma -j bootable/recovery/`
Test: Build and run RecoveryLocalizer on device.
Change-Id: I3359223c82bd670c94ad51296cb8b357b04f5349
2018-05-17 13:10:08 -07:00
Bill Yi
0bfea531d8 Import translations. DO NOT MERGE
Change-Id: I60c4e4ebce0bf3abcc2b0b5ab90b0fc5e9406c34
Auto-generated-cl: translation import
2018-02-21 17:03:26 -08:00
hansson
a7df318913 Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b am: cd06b1696d
am: b1ac1b8494

Change-Id: Id51803759530a630ecfb287126c5e366938ad09f
2018-02-21 17:47:02 +00:00
hansson
b1ac1b8494 Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b
am: cd06b1696d

Change-Id: I78bbe2e58b6d7d442984d3533dedbae705cb156f
2018-02-21 17:37:58 +00:00
Anton Hansson
6cc499ae07 Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I82fee834c5d92e699e9571933faded11c6d4596e
2018-02-21 14:11:02 +00:00
Bill Yi
9bc56553dd Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Iae8fc3afc1453b6b609dae2bbff08231d00735e7
2017-10-20 01:50:04 -07:00
Bill Yi
4d9bd3798e Import translations. DO NOT MERGE
Change-Id: I8de15b09695dea1a53a368c942cb8a7dd30ed87d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-13 08:18:22 -07:00
Bill Yi
8f84774a68 Import translations. DO NOT MERGE
Change-Id: If7aad0299a372403f2875fe3aeb60ad07acb7b47
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-06 06:24:06 -07:00
Bill Yi
9227a5ecec Import translations. DO NOT MERGE
Change-Id: I0b2ff87788553d2c49519d005f8876cd7318b8c6
Auto-generated-cl: translation import
2017-08-27 11:10:05 -07:00
Bill Yi
7b795abd13 Import translations. DO NOT MERGE
Change-Id: I8fb3f973ecd0dfe54dea048ef445d45902eae028
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-23 19:34:04 -07:00
Bill Yi
e332c5ad0e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64680434
Change-Id: Ie356071f322238a5fb3a4610d2a79141c9aa9377
2017-08-17 00:34:01 -07:00
Bill Yi
616256e739 Import translations. DO NOT MERGE
Change-Id: I99a2cf060c75a70b3baf3c22d538fbfa08828474
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 06:53:13 -07:00
Bill Yi
d07422c448 Import translations. DO NOT MERGE
Change-Id: I90d94072de955eca8ea38762faa5d3e5a4f295db
Auto-generated-cl: translation import
2017-02-27 17:41:01 -08:00
Tianjie Xu
29a89a73c5 Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0
am: 281fa9fd30

Change-Id: I109593352d526941895eafea41f87a49561f8fd7
2017-01-23 21:15:15 +00:00
Tianjie Xu
f1a371b1b0 Merge "Restore the max width for recovery background texts" am: c1df344381
am: b037cff12e

Change-Id: I177c4d5edcf8e0ee9874bd1627d0ae12a43ae506
2017-01-23 20:58:06 +00:00
Tianjie Xu
0f7031e295 Restore the max width for recovery background texts
Restore the max width to 900px for xxhdpi and 1200px for xxxhdpi

Bug: 34541299
Test: Checked width and images passed recovery_manual_test
Change-Id: If0fd51f93cfb3f965d4e9e69be5626eba89eb857
2017-01-22 18:46:04 -08:00
Tianjie Xu
86a820cb42 Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93e
am: f92c313723

Change-Id: I36ab3a5d46758ef45854efd16dcf8285166d1dc4
2017-01-13 23:13:38 +00:00
Tianjie Xu
e05674f93e Merge "Update background text images in recovery" am: f0af02fea6
am: 19e4f627d8

Change-Id: Ic16111cc970780090827f3e2851e4df874a5d8cf
2017-01-13 23:09:07 +00:00
Roozbeh Pournader
f23f328513 Rename language+country resources to just language
Bug: 26496609
Test: none
Change-Id: I6467c8496478402614fcdb46c5399dfa28162201
2017-01-10 16:22:48 -08:00
Tianjie Xu
a78b2d2256 Update background text images in recovery
Locale texts are missing in the recovery log due to an extra empty
locale chunk in the png file. Fix the bug in the app and regenerate all
the background texts and compress the file with pngcrush + zopflipng.

Bug: 34054052
Test: Locale texts logged successfully on angler
Change-Id: I89f823a53c1eb69756183e8e11113216d093304f
2017-01-07 00:32:40 +00:00
Bill Yi
0622e407eb Revert "Import translations. DO NOT MERGE"
This reverts commit 6ecd63e459.

Change-Id: I66c34fc72c1e8f6a0c11e12fd7e21864f4437977
2016-12-05 18:46:14 +00:00
Bill Yi
6ecd63e459 Import translations. DO NOT MERGE
Change-Id: Ibe3698aabd36cca6e053ca099b87f09e8ad05c93
Auto-generated-cl: translation import
2016-12-02 23:55:11 -08:00
Bill Yi
9a4ff5a900 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I4d68cd0c69b40d1765cd74dfa730f56be01b5b23
2016-11-20 15:25:37 -08:00
Tianjie Xu
a5dd2a452c Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 am: 5a84cecd26
am: 8b36965175

Change-Id: I6aad408e27e8661a83c6d985d080c0ae8637eec9
2016-08-03 18:11:54 +00:00
Tianjie Xu
5a84cecd26 Merge "Further compress the text images with zopflipng" am: 61240f88ea
am: 3e244dc301

Change-Id: Id651a94190d91c508b55d3745816253160b84284
2016-08-03 18:01:35 +00:00
Tianjie Xu
3e244dc301 Merge "Further compress the text images with zopflipng"
am: 61240f88ea

Change-Id: Ib3b28e84ee331a0e9d613d3761ff4d657c23088d
2016-08-03 17:59:11 +00:00
Tianjie Xu
1123fafd01 Further compress the text images with zopflipng
Bug:30415666
Test: Graphic tests pass on angler with new image files
Change-Id: I8716f53cb2f9fc6598fdc84f84e9626994faaa5e
2016-08-03 10:17:11 -07:00
Tianjie Xu
f136e71f7a Merge \\\\"Add docs on regeneration background text image\\\\" am: 5aa2e104c0 am: b02a58740e am: 698f75467a
am: 0df6011d0f

Change-Id: I9bf3d8a5357811700e7e09aec146eaf1969f6eb9
2016-07-29 00:27:34 +00:00
Tianjie Xu
698f75467a Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0
am: b02a58740e

Change-Id: Ib15f443946a97eeb6609b0aab9b91bcd3ca91d4c
2016-07-29 00:12:42 +00:00
Tianjie Xu
b02a58740e Merge \"Add docs on regeneration background text image\"
am: 5aa2e104c0

Change-Id: I565fa63de18e0c806f2452c009d97c5ad4ebebc3
2016-07-29 00:09:45 +00:00
Tianjie Xu
9a259772cc Add docs on regeneration background text image
Also add a missing string in the recovery_l10n APP.

Bug: 30415666
Change-Id: Ice2a9f7cad4ebe332b427bc0c7a9adccb6cf3af3
2016-07-28 23:45:45 +00:00
Bill Yi
34e2854786 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ie1d01357ef53bd977da8188825dd744801ae58ad
2016-06-30 19:13:48 -07:00
Bill Yi
e404d76e3a Import translations. DO NOT MERGE
Change-Id: Ic9a498dd7367a61fc2d380dc6eeeea0c4cafc8bf
Auto-generated-cl: translation import
2016-04-26 15:01:57 -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
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
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
ebcdea85e3 Remove trailing punctuation from recovery strings.
Bug: http://b/26548285
Change-Id: I235c620532e1759bfc76a4486409a4404f1c8c6a
2016-04-19 16:17:42 -07:00
Elliott Hughes
c30e7978e5 Explicitly set the font face and color. am: 70ae70b
am: 6fa5fa9

* commit '6fa5fa91bf1439e6c5070f3aee9b447f995882c1':
  Explicitly set the font face and color.

Change-Id: I1b2079d35cb7165db738a8d9ca442fa96729979e
2016-04-15 16:01:01 +00:00
Elliott Hughes
6fa5fa91bf Explicitly set the font face and color.
am: 70ae70b

* commit '70ae70b81e452ce8a85dfbb184786c02a9072c23':
  Explicitly set the font face and color.

Change-Id: I94011b0f4df228e6cdfe4c095542839abb689a74
2016-04-15 15:57:55 +00:00
Elliott Hughes
70ae70b81e Explicitly set the font face and color.
This matches what the UI folks asked us to use.

Also fix the locale parsing code.

Bug: http://b/27837319
Bug: http://b/22465983
Bug: http://b/26548285
Change-Id: I316a6e1f44855313dd983950abf21b543be7ffc0
2016-04-14 17:18:41 -07:00
Bill Yi
53ea95d0c2 Import translations. DO NOT MERGE
Change-Id: Id4a5f32acb01776c95b092cc6e883036812836a9
Auto-generated-cl: translation import
2016-04-06 04:02:16 -07:00
Bill Yi
c1afe830cf Import translations. DO NOT MERGE
Change-Id: Ic643d0e2d39e45d772ffb25001de45afdf923579
Auto-generated-cl: translation import
2016-04-05 11:13:59 -07:00
Bill Yi
1b4ee01cfa Import translations. DO NOT MERGE
Change-Id: Ib4ebc02261abc4610947ab54f5e53f9958190e27
Auto-generated-cl: translation import
2016-04-05 09:23:08 -07:00
Bill Yi
f75b6e47de Import translations. DO NOT MERGE
Change-Id: Ia0012b89f00c65ec6056d29612748e60564bab32
Auto-generated-cl: translation import
2016-04-04 17:59:17 -07:00
Bill Yi
af39dc8d36 Import translations. DO NOT MERGE
Change-Id: I5280c977c6c5099c681fa5069bdde9b5426d5949
Auto-generated-cl: translation import
2016-04-04 16:28:16 -07:00
Bill Yi
f1b2785129 Import translations. DO NOT MERGE
Change-Id: Id992a2cff5d431b5862f7c27f3823dbffe52f5c7
Auto-generated-cl: translation import
2016-03-30 22:15:27 -07:00
Bill Yi
452aec0c5b Import translations. DO NOT MERGE
Change-Id: I96a3ebec0ab7b7400bcf8ffd2a899d291d8a4579
Auto-generated-cl: translation import
2016-03-30 20:41:15 -07:00
Tianjie Xu
0f54a46af3 Add string for Installing_security_update
am: 1ee0ff3

* commit '1ee0ff3d78c5143d4e3307bc44e3c27792e72d1e':
  Add string for Installing_security_update

Change-Id: Ied2a3b07fbf8548688759727da527fc7a994d5a0
2016-03-29 21:06:05 +00:00
Tianjie Xu
1c95c97e55 Add string for Installing_security_update
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
(cherry picked from commit 1ee0ff3d78)
2016-03-29 13:59:22 -07:00
Tianjie Xu
1ee0ff3d78 Add string for Installing_security_update
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
2016-03-28 18:16:15 -07:00
Elliott Hughes
cc79490fa8 Move recovery_l10n here from development/tools.
Bug: http://b/27837319

(cherry picked from commit 3d0153a807)

Change-Id: Iec2cd10fa77ed1881d55ac4e0ab48e45172f0cf7
2016-03-26 08:45:51 -07:00
Elliott Hughes
2dbd06c7ed Merge "Move recovery_l10n here from development/tools." 2016-03-26 15:45:24 +00:00
Elliott Hughes
3d0153a807 Move recovery_l10n here from development/tools.
Bug: http://b/27837319
Change-Id: I116fc13ae108a59b657f5c9f7efe971de72ac743
2016-03-26 08:42:49 -07:00
Elliott Hughes
57eb4fd6e2 Remove dead tools.
None of these have been touched since cupcake, except to keep them building.

Change-Id: I5ed13849e6842e755c62da05f1a8a6da2583b1ee
2016-03-22 21:08:39 -07:00
Mattias Nissler
b66f047d41 Remove dumpkey build guards after completing code move.
Bug: 27326256
Change-Id: Ia713b23e3c898c1f10af7c61ea67f34601fdcbe3
2016-02-26 11:20:18 +01:00
Mattias Nissler
03b72b0f37 Move dumpkey tool to the recovery repo.
The dumpkey tool is used to dump encryption keys in a custom format
used by the recovery code. Nobody else uses this format AFAICT, so
it's more appropriate to keep the code of the tool alongside the
recovery code instead of next to mincrypt.

BUG:27326256
Change-Id: I30176845617972be1d6e46e9a9218e161fbf0680
2016-02-24 14:53:10 +01:00
Elliott Hughes
7bad7c4646 Check all lseek calls succeed.
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.

Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
2015-04-29 17:46:43 -07:00
Elliott Hughes
cd3c55ab40 Add missing includes.
Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
2015-01-29 20:50:08 -08:00
Mark Salyzyn
f3bb31c32f Recovery 64-bit compile issues
Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
2014-03-14 13:51:39 -07:00
Edwin Vane
4f66d550e9 Fixed unused param warnings for check-lost+found
A few simple warnings fixed to produce a clean clang build.

Change-Id: I9484f860903a80e4c91e204e7e6738145535f642
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
2012-08-21 16:03:46 -04:00
Jeff Brown
b0462e6ae2 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
2011-07-11 22:11:45 -07:00
Doug Zongker
64893ccc09 remove amend
Yank all the code to install OTA packages out of the recovery binary
itself.  Now packages are installed by a binary included in the
package (run as a child of recovery), so we can make improvements in
the installation process without waiting for a new release to use
them.
2009-07-14 16:58:42 -07:00
Doug Zongker
bc012de46e Automated import from //branches/donutburger/...@142141,142141 2009-03-24 21:30:32 -07:00
The Android Open Source Project
c24a8e688a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
ffb48f64fe auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
d4ae69739e auto import from //depot/cupcake/@132589 2009-03-03 14:03:51 -08:00
The Android Open Source Project
15bb56d89a auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project
ff3d93821e Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
23580ca27a Initial Contribution 2008-10-21 07:00:00 -07:00