e7935db536
release-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release-4163697 snap-temp-L79500000080559163
...
Change-Id: I29a0df65f76250a6ba7359be1bcf28f5798e7d77
2017-07-07 22:01:47 +00:00
84e4b9fe87
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4b
...
am: 79c1562dc9
2017-07-07 18:32:43 +00:00
79c1562dc9
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f
...
am: 233f4b0b4b
2017-07-07 18:11:59 +00:00
233f4b0b4b
Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16
...
am: 8542502f1f
2017-07-07 17:55:18 +00:00
8542502f1f
Merge "Fix a rare failure for imgdiff when random data equals gzip header"
...
am: b87a166a16
2017-07-07 17:52:26 +00:00
b87a166a16
Merge "Fix a rare failure for imgdiff when random data equals gzip header"
2017-07-07 17:42:12 +00:00
37f3b5cdcb
Restructure vr_ui am: c392888df7 -s ours
...
am: 1c8189c851
2017-07-07 01:23:42 +00:00
1c8189c851
Restructure vr_ui
...
am: c392888df7
2017-07-07 01:21:36 +00:00
f2654a5484
Merge "Introduce VR recovery ui am: edc6b52f00 -s ours am: 6660c97f07"
2017-07-07 00:43:25 +00:00
14daca2d9f
Introduce VR recovery ui am: edc6b52f00 -s ours
...
am: 6660c97f07
2017-07-07 00:42:45 +00:00
45a74276d2
Introduce VR recovery ui am: edc6b52f00 -s ours
...
am: 6660c97f07
2017-07-07 00:41:55 +00:00
6660c97f07
Introduce VR recovery ui
...
am: edc6b52f00
2017-07-07 00:38:12 +00:00
c392888df7
Restructure vr_ui
...
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.
Cherry picked from commit 81a8e4cab2
2017-07-06 16:49:27 -07:00
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
edc6b52f00
Introduce VR recovery ui
...
A version of screen ui with specific adjustments for vr device
compatibility.
Cherry picked from commit a44dba7f4e
2017-07-06 21:53:00 +00:00
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
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
411bb18c73
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
...
am: 6895d5c44d
2017-07-05 22:45:31 +00:00
995f02e54d
Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp
...
am: 114b555807
2017-07-05 22:45:28 +00:00
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
d52ad6a8f8
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
...
am: 987c5a98a8
2017-07-05 22:44:02 +00:00
23b2e1bc15
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
...
am: 987c5a98a8
2017-07-05 22:43:53 +00:00
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
6895d5c44d
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev
...
am: bee95d6866
2017-07-05 22:40:44 +00:00
987c5a98a8
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev
...
am: bee95d6866
2017-07-05 22:40:26 +00:00
bee95d6866
Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev
2017-07-05 22:33:35 +00:00
b6b8b53fa9
release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440
...
Change-Id: Ia32c0e10ab5ce47b60553e08ab528fb8d6471771
2017-07-02 07:31:57 +00:00
154a6e71a6
Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa am: 7e3b1c00c6
...
am: 9e62767759
2017-07-02 02:54:16 +00:00
9e62767759
Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa
...
am: 7e3b1c00c6
2017-07-02 02:51:46 +00:00
7e3b1c00c6
Merge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c
...
am: c24d97fafa
2017-07-02 02:49:46 +00:00
c24d97fafa
Merge "Update ScreenRecoveryUI::Draw* function signatures."
...
am: c8e338fa9c
2017-07-02 02:47:16 +00:00
c8e338fa9c
Merge "Update ScreenRecoveryUI::Draw* function signatures."
2017-07-02 02:42:46 +00:00
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
7ba666b746
screen_ui: Compute the top and bottom gaps. am: f95e686dd0 -s ours
...
am: b649cad15f
2017-06-30 05:46:58 +00:00
b649cad15f
screen_ui: Compute the top and bottom gaps.
...
am: f95e686dd0
2017-06-30 05:41:59 +00:00
059622dd8b
Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f am: 2fbbd488d6
...
am: 3a0fbd46ab
2017-06-30 04:20:26 +00:00
3a0fbd46ab
Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef am: 1783254c3f
...
am: 2fbbd488d6
2017-06-30 04:16:27 +00:00
2fbbd488d6
Merge "screen_ui: Compute the top and bottom gaps." am: 344778c4ef
...
am: 1783254c3f
2017-06-30 04:11:25 +00:00
1783254c3f
Merge "screen_ui: Compute the top and bottom gaps."
...
am: 344778c4ef
2017-06-30 04:06:26 +00:00
344778c4ef
Merge "screen_ui: Compute the top and bottom gaps."
2017-06-30 03:59:25 +00:00
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
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
be8a565c39
release-request-fbba21d1-17b5-4752-9864-95770e5db190-for-git_oc-mr1-release-4144771 snap-temp-L10300000078657232
...
Change-Id: If037aa310a32dd1e7a448387a20d1e83ee3e960e
2017-06-29 07:32:53 +00:00
2ba0d49455
Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f am: c3437622cc
...
am: fa9509d016
2017-06-29 04:15:27 +00:00
fa9509d016
Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4 am: c9e411858f
...
am: c3437622cc
2017-06-29 04:11:25 +00:00
c3437622cc
Merge "wear_ui: Remove dead/duplicate codes." am: f722fcf0d4
...
am: c9e411858f
2017-06-29 04:07:26 +00:00
c9e411858f
Merge "wear_ui: Remove dead/duplicate codes."
...
am: f722fcf0d4
2017-06-29 04:03:25 +00:00
f722fcf0d4
Merge "wear_ui: Remove dead/duplicate codes."
2017-06-29 03:55:53 +00:00
0bc54dd83f
wear_ui: Remove dead/duplicate codes.
...
WearRecoveryUI::draw_progress_locked() has declaration only, where
the definition was deleted in commit
5e7cfb9af6
2017-06-28 15:32:23 -07:00
39c6051c1e
Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb am: 8b4c7e7567
...
am: 171642fac5
2017-06-28 16:51:40 +00:00
android-build-team Robot
Tianjie Xu
Luke Song
Android Build Merger (Role)
Jin Qian
TreeHugger Robot
Tao Bao
Elliott Hughes