PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,791 Commits 1 Branch 0 Tags
71dd66f8d4131b75faa8a4b344df05dfca0ff353
Commit Graph

4791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role) 71dd66f8d4 Merge "Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp am: 114b555807 -s ours" 2017-07-05 22:46:57 +00:00
Android Build Merger (Role) 10ca6335c4 Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 6895d5c44d -s ours" 2017-07-05 22:46:51 +00:00
Jin Qian 411bb18c73 Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 
am: 6895d5c44d  -s ours

Change-Id: I4e242646ec15b2b54c44186770a32cf7b27b356c
 2017-07-05 22:45:31 +00:00
Jin Qian 995f02e54d Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp 
am: 114b555807  -s ours

Change-Id: I013b898521c2563d2cf9ed85ce51324c25c0004b
 2017-07-05 22:45:28 +00:00
Android Build Merger (Role) cf8aed1d13 Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 am: 987c5a98a8 -s ours" 2017-07-05 22:45:11 +00:00
Jin Qian d52ad6a8f8 Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 
am: 987c5a98a8  -s ours

Change-Id: I67a9066b3e91c260c8140af729ea935c7537cd21
 2017-07-05 22:44:02 +00:00
Jin Qian 23b2e1bc15 Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866 
am: 987c5a98a8  -s ours

Change-Id: Ia186c727dd25fb7b5aa13914bd1ad72392870e21
 2017-07-05 22:43:53 +00:00
Android Build Merger (Role) 114b555807 Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp 2017-07-05 22:41:56 +00:00
Jin Qian 6895d5c44d Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev 
am: bee95d6866

Change-Id: Iafcdb0e0b27090349d17f130bc0bcdb45ff1b8d4
 2017-07-05 22:40:44 +00:00
Jin Qian 987c5a98a8 Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev 
am: bee95d6866

Change-Id: I2428f35c9c8a67ba8f1de23602b4110641e63a3f
 2017-07-05 22:40:26 +00:00
TreeHugger Robot bee95d6866 Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev 2017-07-05 22:33:35 +00:00
Tao Bao 154a6e71a6 Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa am: 7e3b1c00c6 
am: 9e62767759

Change-Id: I65581d1580fbb6bc0ee85c980f6f79aedf33d8fe
 2017-07-02 02:54:16 +00:00
Tao Bao 9e62767759 Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa 
am: 7e3b1c00c6

Change-Id: I8892407f036aa2dd1a8e90068274362648cc6cc0
 2017-07-02 02:51:46 +00:00
Tao Bao 7e3b1c00c6 Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c 
am: c24d97fafa

Change-Id: I6ab605dc914bed4f5104b6fd405d7f5f19a5d863
 2017-07-02 02:49:46 +00:00
Tao Bao c24d97fafa Merge "Update ScreenRecoveryUI::Draw* function signatures." 
am: c8e338fa9c

Change-Id: I8754a10003053459407cbc633a527943a622385a
 2017-07-02 02:47:16 +00:00
Treehugger Robot c8e338fa9c Merge "Update ScreenRecoveryUI::Draw* function signatures." 2017-07-02 02:42:46 +00:00
Tao Bao ea78d86b44 Update ScreenRecoveryUI::Draw* function signatures. 
Move away from taking int* for the Y-offset. Change it to int and return
the offset instead.

Test: Check the recovery menu and 'Wipe data' menu.
Change-Id: Ib15e070a0d576a0f8f66f35605cb8479e7071f26
 2017-07-01 17:41:24 -07:00
Tao Bao 7ba666b746 screen_ui: Compute the top and bottom gaps. am: f95e686dd0 -s ours 
am: b649cad15f

Change-Id: I28c43e6f673457b8765afd965762c09cd662e5b2
 2017-06-30 05:46:58 +00:00
Tao Bao b649cad15f screen_ui: Compute the top and bottom gaps. 
am: f95e686dd0  -s ours

Change-Id: Iaa00625c3820ca4a88e1fe3dd0ef38dc03561a66
 2017-06-30 05:41:59 +00:00
Tao Bao 059622dd8b Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f am: 2fbbd488d6 
am: 3a0fbd46ab

Change-Id: I44e6fe34e97cffc6de29eb27927fb9752cc4ade8
 2017-06-30 04:20:26 +00:00
Tao Bao 3a0fbd46ab Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f 
am: 2fbbd488d6

Change-Id: Ide3de0d21546c39508bc35806d544a7c4831c7c7
 2017-06-30 04:16:27 +00:00
Tao Bao 2fbbd488d6 Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef 
am: 1783254c3f

Change-Id: I022f5b36f750a6ee2640974ec8b2eb9bd1d504b9
 2017-06-30 04:11:25 +00:00
Tao Bao 1783254c3f Merge "screen_ui: Compute the top and bottom gaps." 
am: 344778c4ef

Change-Id: If58672e390c4794bc93946e6a090da88a7acc90a
 2017-06-30 04:06:26 +00:00
Tao Bao 344778c4ef Merge "screen_ui: Compute the top and bottom gaps." 2017-06-30 03:59:25 +00:00
Tao Bao f95e686dd0 screen_ui: Compute the top and bottom gaps. 
We're not actually following the gaps as in the comments. For example,
Nexus 6P is supposed to use 220dp and 194dp gaps (top and bottom
respectively), but the actual numbers are 185dp and 194dp. Because the
animation icon and text sizes don't match the ones claimed (animation:
expected 200dp or 700px, actual 800px; text: claimed 14sp, actual 76px).
The top gap changes (shrinks) as we compute the baselines bottom-up.

This CL switches to using computed gaps: the major UI elements always
stay vertically centered, with identical top and bottom gaps.

Bug: 63093285
Test: 'Run graphics test' on angler/volantis/fugu/ryu.
Change-Id: I3cadbb34f728cf034afa47ac02a6deba8cb6b4e7
(cherry picked from commit 3250f72360)
 2017-06-29 18:23:21 -07:00
Tao Bao 3250f72360 screen_ui: Compute the top and bottom gaps. 
We're not actually following the gaps as in the comments. For example,
Nexus 6P is supposed to use 220dp and 194dp gaps (top and bottom
respectively), but the actual numbers are 185dp and 194dp. Because the
animation icon and text sizes don't match the ones claimed (animation:
expected 200dp or 700px, actual 800px; text: claimed 14sp, actual 76px).
The top gap changes (shrinks) as we compute the baselines bottom-up.

This CL switches to using computed gaps: the major UI elements always
stay vertically centered, with identical top and bottom gaps.

Bug: 63093285
Test: 'Run graphics test' on angler/volantis/fugu/ryu.
Change-Id: I3cadbb34f728cf034afa47ac02a6deba8cb6b4e7
 2017-06-29 14:59:08 -07:00
Tao Bao 2ba0d49455 Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f am: c3437622cc 
am: fa9509d016

Change-Id: Id8be2884158aca182202451eea7038fa5328151a
 2017-06-29 04:15:27 +00:00
Tao Bao fa9509d016 Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f 
am: c3437622cc

Change-Id: I97062d996f0b707a88a4c3e3f88392e3f3ee69ad
 2017-06-29 04:11:25 +00:00
Tao Bao c3437622cc Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 
am: c9e411858f

Change-Id: Ib7ed03df1c1f23d4419cb932495f26f15006e3be
 2017-06-29 04:07:26 +00:00
Tao Bao c9e411858f Merge "wear_ui: Remove dead/duplicate codes." 
am: f722fcf0d4

Change-Id: I621c528b73da0fade1473235ce2710cbd8d9bc95
 2017-06-29 04:03:25 +00:00
Tao Bao f722fcf0d4 Merge "wear_ui: Remove dead/duplicate codes." 2017-06-29 03:55:53 +00:00
Tao Bao 0bc54dd83f wear_ui: Remove dead/duplicate codes. 
WearRecoveryUI::draw_progress_locked() has declaration only, where
the definition was deleted in commit
5e7cfb9af6.

WearRecoveryUI::ClearText() is a duplicates of
ScreenRecoveryUI::ClearText().

Test: Build swordfish recovery image. 'Run graphics test' and 'View
      recovery logs'.
Change-Id: Ib66955d1d496f04359b4d6487160218e8f954478
 2017-06-28 15:32:23 -07:00
Elliott Hughes 39c6051c1e Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb am: 8b4c7e7567 
am: 171642fac5

Change-Id: I63a77f7ba32a624f73d0324483f4c747407b9266
 2017-06-28 16:51:40 +00:00
Elliott Hughes 171642fac5 Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb 
am: 8b4c7e7567

Change-Id: Id1a0722d51b5f8142b87112f0b32e6162892c199
 2017-06-28 16:48:10 +00:00
Elliott Hughes 8b4c7e7567 Merge "Add missing libziparchive dependency." am: f9fe6a705d 
am: 78ff0832cb

Change-Id: I57e2b9a4e42e3e32e5f3d4ca550ea59898abbff1
 2017-06-28 16:44:40 +00:00
Elliott Hughes 78ff0832cb Merge "Add missing libziparchive dependency." 
am: f9fe6a705d

Change-Id: Iface325955657b6c8f72d19fbbe7b8e475a15fbb
 2017-06-28 16:41:12 +00:00
Treehugger Robot f9fe6a705d Merge "Add missing libziparchive dependency." 2017-06-28 16:35:39 +00:00
Elliott Hughes e1bb7a5752 Add missing libziparchive dependency. 
Bug: http://b/37560614
Test: builds even after removing system/core/include/ziparchive
Change-Id: Ib7ed45cafe83d24ed55aac28b4f41a073c371bc2
 2017-06-28 08:00:17 -07:00
Tao Bao 46d4eb571d Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 am: 57191920e8 
am: 8e4ddcce97

Change-Id: I46ee95ae8d3a1ef7ae6ba76b8125ed2774b1d510
 2017-06-27 22:48:02 +00:00
Tao Bao 8e4ddcce97 Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 
am: 57191920e8

Change-Id: I8320f696ca21b14564a3fa38937fdf090eeff4f7
 2017-06-27 22:41:33 +00:00
Tao Bao 57191920e8 Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 
am: 2e20c11828

Change-Id: Ib467bf7ae8a7a581617cdd124c3803a5aa631031
 2017-06-27 22:38:34 +00:00
Tao Bao 2e20c11828 Merge "Add override specifier and member constness to RecoveryUI classes." 
am: d6fb1c6367

Change-Id: I9b012c3096563e3c0187f644ed4fa930e785c502
 2017-06-27 22:35:32 +00:00
Tao Bao d6fb1c6367 Merge "Add override specifier and member constness to RecoveryUI classes." 2017-06-27 22:29:36 +00:00
Tao Bao e793b3c880 Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a am: a6aa96f3fd 
am: 43a866cbe6

Change-Id: I430963a4ad3c9aea4cd3a1530c419a009dd09dcc
 2017-06-27 19:23:18 +00:00
Tao Bao 43a866cbe6 Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a 
am: a6aa96f3fd

Change-Id: I08d87ae7eed266f1b755b6bfe94699e64d474ab2
 2017-06-27 19:11:48 +00:00
Tao Bao a6aa96f3fd Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 
am: 076aba3d8a

Change-Id: I6a16dab86d41026f7a2501a3ee7601ae97c5dd72
 2017-06-27 19:09:18 +00:00
Tao Bao 076aba3d8a Merge "Formatting RecoveryUI related files." 
am: 8e7db8f4a6

Change-Id: I81e0e1e088da045f217aff957c7c5730d09cabbe
 2017-06-27 19:06:17 +00:00
Treehugger Robot 8e7db8f4a6 Merge "Formatting RecoveryUI related files." 2017-06-27 19:00:48 +00:00
Tianjie Xu 97f1848c0c Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923 am: 09b438052e 
am: 312c30c4f7

Change-Id: I683bfd5fd505435b096ccfe871388d628264593f
 2017-06-27 00:51:44 +00:00
Jin Qian 619b162d67 recovery: replace make_ext4 with e2fsprogs 
Execute mke2fs to create empty ext4 filesystem.
Execute e2fsdroid to add files to filesystem.

Test: enter recovery mode and wipe data
Bug: 35219933
Change-Id: I10a9f4c1f4754ad864b2df45b1f879180ab33876
Merged-In: I10a9f4c1f4754ad864b2df45b1f879180ab33876
 2017-06-27 00:34:43 +00:00