Bill Yi
00874ceb73
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I60b8d46e36b46008493de2e451d3182787109775
2021-04-19 19:55:21 +00:00
Bill Yi
0c955dd484
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cc773de7c06c6a4d6aec2498e39c5c3633b6dd5
2021-04-15 21:36:47 +00:00
Bill Yi
daf7da35f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e7bba7620
-s ours am: 551ca7568c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14161797
Change-Id: Ic69bcf65e984ac47bbcb6ec9d625965e7166f591
2021-04-12 19:53:24 +00:00
Bill Yi
551ca7568c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e7bba7620
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14161797
Change-Id: I000e1d6becb15dae8e731d144468f586cd3aa6d3
2021-04-12 19:04:44 +00:00
Bill Yi
5e7bba7620
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0795c8ddd7d70038a5b6935a6a2a37dde36bb41e
2021-04-12 09:23:11 -07:00
Bill Yi
add68b3fc8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ec0b3b489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14134299
Change-Id: Ia4a532109d0dc4751a49a07e63751088beb386c8
2021-04-09 17:11:17 +00:00
Bill Yi
2ec0b3b489
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2319c692bc7f1d457ece26843bc660bce027f21d
2021-04-08 23:36:47 -07:00
Bill Yi
5f6d08f526
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e045405d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14093285
Change-Id: I2c7fd349aa9d5124ab581000c7c91de5d086dfbd
2021-04-05 17:14:45 +00:00
Bill Yi
8e045405d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id1c247ae55b8ff5311ae07200b8b9f618cf53f3f
2021-04-05 04:56:28 -07:00
TreeHugger Robot
1238812ed4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-01 21:12:51 +00:00
Treehugger Robot
e807efd1ea
[automerger skipped] Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390
am: 4810c99f09
am: 20c3f60afe
-s ours
...
am skip reason: skip tag Change-Id I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3 with SHA-1 8929f899ac
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606
Change-Id: I23eb24ff64e3be1a731b502f970f3f6501444d8b
2021-03-31 23:29:44 +00:00
Treehugger Robot
20c3f60afe
Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390
am: 4810c99f09
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606
Change-Id: Ic6f5008f010cc24cf7d78c3955ec6d535212e98b
2021-03-31 22:43:42 +00:00
Treehugger Robot
4810c99f09
Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606
Change-Id: Ib1a6d554c29ca3d8fb227c7a153bf810373e9922
2021-03-31 22:16:54 +00:00
Treehugger Robot
853dd83390
Merge "Revert "Update ImageGenerator to match the latest font names.""
2021-03-31 21:49:21 +00:00
Seigo Nonaka
e105751292
Revert "Update ImageGenerator to match the latest font names."
...
Revert "Rename font file with PostScript based names"
Revert submission 1606485-rename_fonts
Reason for revert: font file name requirement was removed.
Reverted Changes:
Iab8b9d65a:Update ImageGenerator to match the latest font nam...
Ifbe99d68c:Rename the font file with PostScript name based fi...
I307c21531:Rename font file with PostScript based names
Change-Id: Ic8174b4a4a736d9079dee4106bdfa5c440f877bb
Merged-In: I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3
2021-03-31 20:38:07 +00:00
TreeHugger Robot
9ae11b3644
Merge "Revert "Update ImageGenerator to match the latest font names."" into sc-dev
2021-03-31 20:10:04 +00:00
Bill Yi
44acb4b964
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c748991e3e86d9892155c303c0ded675dfbef4f
2021-03-31 14:31:08 +00:00
Seigo Nonaka
8929f899ac
Revert "Update ImageGenerator to match the latest font names."
...
This reverts commit 0a4e828357
.
Reason for revert: font file name requirement has removed.
Change-Id: I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3
2021-03-31 06:34:18 +00:00
Bill Yi
e0988fb2b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec65618d0c
-s ours am: 83881d1754
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14020467
Change-Id: Iff57ac0a7d9d60ece22e8e9e9f7bb46b1e5cb350
2021-03-30 02:23:31 +00:00
Bill Yi
83881d1754
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec65618d0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14020467
Change-Id: Id7a24045bf6f73401e76c108dbbd0c1d9da06e68
2021-03-30 01:36:43 +00:00
Bill Yi
ec65618d0c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibd642425552b2e15021dfa896ee9e731e0ba8b59
2021-03-29 11:06:08 -07:00
Bill Yi
301a244ebb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c882b4b282
-s ours am: 7fc385e9a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14006646
Change-Id: Ie2c193b3b45ad70a7dd8081f66468f059bdc1cc8
2021-03-26 22:34:14 +00:00
Bill Yi
7fc385e9a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c882b4b282
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/14006646
Change-Id: I01bc904d82ab77e621e26ed541a9d98d95e083e4
2021-03-26 22:08:10 +00:00
Bill Yi
c882b4b282
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifbac1882a2293492cbcca5919aac3d910a5dbce3
2021-03-26 13:11:06 -07:00
Treehugger Robot
03d8d81560
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: c5a1b2af59
am: a6915b249c
am: 467ee43e6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13974662
Change-Id: Ic4a9a3a7ded5e0b3d498fcb8da66b1fe2b88a11f
2021-03-25 02:42:54 +00:00
Treehugger Robot
2e85b6f035
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: c5a1b2af59
am: 30818876f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13974662
Change-Id: I84081d7182a3e2d2619d1b6578ba2dd8f3630936
2021-03-25 02:18:37 +00:00
Treehugger Robot
467ee43e6e
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: c5a1b2af59
am: a6915b249c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13974662
Change-Id: I01563e75274c92667091643365dcb9a2cef60853
2021-03-25 01:32:38 +00:00
Treehugger Robot
30818876f1
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: c5a1b2af59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13974662
Change-Id: Ie710eed321d5ff12346444d24240dc751dc8728e
2021-03-25 01:17:54 +00:00
Treehugger Robot
a6915b249c
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
am: c5a1b2af59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13974662
Change-Id: I17ed667f26a500d19b6110c992b01e8448e7f7bc
2021-03-25 01:13:18 +00:00
Treehugger Robot
c5a1b2af59
Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701
am: d66516ea7c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248
Bug: 183523550
Change-Id: I8ba2762b11802ba60bc79fe4ae5fe6eea3437cd6
(cherry picked from commit bc606682d2
)
2021-03-23 17:43:57 -04:00
Tianjie Xu
82608b1859
Merge "Bring up the erase animation early for data wipe" am: 8082b71f45
am: b845427da8
am: 4a3144a6ae
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1613899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22fdcb5978bd2d99ddad0bb42e3ec1eb5d39a3d8
2021-03-11 07:07:18 +00:00
Tianjie Xu
4a3144a6ae
Merge "Bring up the erase animation early for data wipe" am: 8082b71f45
am: b845427da8
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1613899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28eb1cda0232a83d286c5eb373400308a1cac530
2021-03-11 06:26:21 +00:00
Tianjie Xu
b845427da8
Merge "Bring up the erase animation early for data wipe" am: 8082b71f45
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1613899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I18db841d673928dbefe97142cbdafd6f4c61db51
2021-03-11 05:53:06 +00:00
Tianjie Xu
8082b71f45
Merge "Bring up the erase animation early for data wipe"
2021-03-11 05:30:17 +00:00
Xin Li
23870fcad0
[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf
-s ours am: fc8f576c00
-s ours am: 16da08890d
-s ours
...
am skip reason: Change-Id I90dcd247e1541f3bf7f16d95c7cef6256ae462aa with SHA-1 4de32b2fb2
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1613620
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6706d671a1c962402faa84674b5f6499d2b22b62
2021-03-04 00:12:00 +00:00
Xin Li
16da08890d
[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf
-s ours am: fc8f576c00
-s ours
...
am skip reason: Change-Id I90dcd247e1541f3bf7f16d95c7cef6256ae462aa with SHA-1 4de32b2fb2
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1613620
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I533c0928c0091a1ace15c08771fbf36f64fc2a68
2021-03-03 23:37:00 +00:00
Xin Li
fc8f576c00
[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf
-s ours
...
am skip reason: Change-Id I90dcd247e1541f3bf7f16d95c7cef6256ae462aa with SHA-1 4de32b2fb2
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1613620
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a191eaa3a0abbe1d379f65d9475d0c54bd01c44
2021-03-03 22:28:34 +00:00
TreeHugger Robot
fcd45b229c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 68a4bc03b1
-s ours am: 2c317dd6b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13756596
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I15d1d277b204d6b9ae0068c06423bf8dfec8f357
2021-03-03 22:05:15 +00:00
Xin Li
a952c55faf
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:37 +00:00
TreeHugger Robot
478733bcfc
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-03 21:24:51 +00:00
TreeHugger Robot
2c317dd6b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 68a4bc03b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13756596
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5547207ce4455f2c470c4ab17ceaa0a89796f97
2021-03-03 20:53:17 +00:00
TreeHugger Robot
68a4bc03b1
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-03 20:23:41 +00:00
Bill Yi
fb76d982a7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03ef1d57f6bfcfa6f01b06355adbdf629f83b190
2021-03-03 18:46:23 +00:00
Bill Yi
47ceeb0161
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24b72c6bdc993153b15d3d04dfa4d754bcc6b7e0
2021-03-03 17:55:18 +00:00
Bill Yi
c57acac4d8
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7f9d1171f6
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13756594
Change-Id: Ieabefb1423040628d0695bc6979d9410c7edb992
2021-03-03 17:29:36 +00:00
Bill Yi
7f9d1171f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icb6ccff018ae8cf29f1e6f03b4c8df15c1966884
2021-03-03 17:29:22 +00:00
Xin Li
16c0fc41ae
Merge RQ2A.210305.007
...
Bug: 180401296
Merged-In: I90dcd247e1541f3bf7f16d95c7cef6256ae462aa
Change-Id: Icfa724d8b03a581efc222d94b001add39c369caf
2021-03-03 09:12:01 -08:00
Tianjie
32b4e72a24
Bring up the erase animation early for data wipe
...
Right now the "Erasing" animation displays after the merge step
during the FDR process; and the merge can take 3-4 minutes. The
users maybe confused about the blank screen and forcefully
reboot the device.
Bug: 181636823
Test: add sleep merge, check the animation displays correctly.
Change-Id: Ib23b1ed3a84e95640271a429c51a3d3c142dc404
2021-03-02 16:42:07 -08:00
Bill Yi
e8db3f117a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2493a8826
-s ours am: 184d58aa2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13738545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e5682b48dce4844a76854444bea010a172ac755
2021-03-02 20:39:32 +00:00
Bill Yi
184d58aa2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2493a8826
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13738545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b25e1fdca17fe707bc973ee59d6515704cea57c
2021-03-02 19:47:02 +00:00