Commit Graph

4764 Commits

Author SHA1 Message Date
Tianjie Xu
79c1562dc9 Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f
am: 233f4b0b4b

Change-Id: If7e81b8e794f34d374d385eb5603353cdfec524f
2017-07-07 18:11:59 +00:00
Tianjie Xu
233f4b0b4b Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16
am: 8542502f1f

Change-Id: Iaf46b8d2abad2357975ba6ecedaeed522c20b51e
2017-07-07 17:55:18 +00:00
Tianjie Xu
8542502f1f Merge "Fix a rare failure for imgdiff when random data equals gzip header"
am: b87a166a16

Change-Id: Ic3c7d102cc7a2b992c699add012076a4bda549c6
2017-07-07 17:52:26 +00:00
Tianjie Xu
b87a166a16 Merge "Fix a rare failure for imgdiff when random data equals gzip header" 2017-07-07 17:42:12 +00:00
Luke Song
1c8189c851 Restructure vr_ui
am: c392888df7  -s ours

Change-Id: I898ecb8a10383d0aaba9cbaf3f47911b5e895576
2017-07-07 01:21:36 +00:00
Luke Song
6660c97f07 Introduce VR recovery ui
am: edc6b52f00  -s ours

Change-Id: I4b6b4a5c7ffc3ae29c0b35d91f19ed56048ab049
2017-07-07 00:38:12 +00:00
Luke Song
c392888df7 Restructure vr_ui
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.

Cherry picked from commit 81a8e4cab2

Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
2017-07-06 16:49:27 -07:00
Tianjie Xu
14ebc1e5ae Fix a rare failure for imgdiff when random data equals gzip header
In a rare case, a random chunk will pass both the gzip header check
and the inflation process; but fail the uncompressed length check in the
footer. This leads to a imgdiff failure. So, we should treat this chunk
as 'normal' instead of 'inflated' while generating the patch.

Bug: 63334984
Test: imgdiff generates patch successfully on previous failing images.
Change-Id: Ice84f22d3653bce9756bda91e70528c0d2f264a0
2017-07-06 16:49:11 -07:00
Luke Song
edc6b52f00 Introduce VR recovery ui
A version of screen ui with specific adjustments for vr device
compatibility.

Cherry picked from commit a44dba7f4e

Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
2017-07-06 21:53:00 +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
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
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
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
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
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
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
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
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
Tianjie Xu
312c30c4f7 Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923
am: 09b438052e

Change-Id: I56e26389c5959eaa0b8d734515fbbe5dc4b414c0
2017-06-26 22:03:46 +00:00
Tianjie Xu
09b438052e Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987
am: 170aa1c923

Change-Id: Ia11eec1dc9c1b484f7f5cd67ff1792b5c3423a26
2017-06-26 22:01:18 +00:00
Tianjie Xu
170aa1c923 Merge "avoid assuming build number is a 32-bit integer"
am: 30afdee987

Change-Id: Ibe47feaf6d00838db24b76a51e2418772f329e0d
2017-06-26 21:56:49 +00:00
Tianjie Xu
30afdee987 Merge "avoid assuming build number is a 32-bit integer" 2017-06-26 21:12:09 +00:00
Daniel Micay
a29d8d69d2 avoid assuming build number is a 32-bit integer
The install logging currently assumes that the build number is a 32-bit
integer and prints an error when that doesn't hold true. However, that's
only a convention used by Google builds.

From build/core/version_defaults.mk:

    ifeq "" "$(BUILD_NUMBER)"
      # BUILD_NUMBER should be set to the source control value that
      # represents the current state of the source code.  E.g., a
      # perforce changelist number or a git hash.  Can be an arbitrary string
      # (to allow for source control that uses something other than numbers),
      # but must be a single word and a valid file name.
      #
      # If no BUILD_NUMBER is set, create a useful "I am an engineering build
      # from this date/time" value.  Make it start with a non-digit so that
      # anyone trying to parse it as an integer will probably get "0".
      BUILD_NUMBER := eng.$(shell echo $${USER:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S)
    endif

Change-Id: I8e7cec0618783f69545ba76d0dce2bbc1681784c
2017-06-26 10:53:03 -04:00
Tao Bao
99b2d77475 Add override specifier and member constness to RecoveryUI classes.
Test: mmma bootable/recovery
Change-Id: I66e328614423488a4027d7878f4569fbf3a3721e
2017-06-23 23:06:01 -07:00