Doug Zongker
25c2b2f670
am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"
...
* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
restore minui support for paletted images with < 8 bits
2014-03-20 16:31:14 +00:00
Doug Zongker
aa4545b5ae
Merge "restore minui support for paletted images with < 8 bits"
2014-03-20 15:28:32 +00:00
Doug Zongker
577a130435
restore minui support for paletted images with < 8 bits
...
The PNG image loaders should support images that use palettes
requiring fewer than 8 bits.
Change-Id: Ibcb0ff6f04aea8de54b03c0efa7a79e9b3635146
2014-03-20 08:27:01 -07:00
Mark Salyzyn
2605dec597
recovery: 64 bit build issues
...
Change-Id: Ie88c49dea13cce5f4eb428e97f5a0956f2656a30
2014-03-19 15:30:25 -07:00
Doug Zongker
b07b3d15b9
am 03002477: am bacf9b45: add --shutdown_after option to recovery
...
* commit '0300247758cf1965867128c79d94e0b2c38a69aa':
add --shutdown_after option to recovery
2014-03-18 20:53:01 +00:00
Doug Zongker
a898c52b64
am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp
...
* commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a':
add --shutdown_after option to recovery
2014-03-18 20:52:43 +00:00
Doug Zongker
0300247758
am bacf9b45: add --shutdown_after option to recovery
...
* commit 'bacf9b4558c69e918d9c05b6f111bbb223829829':
add --shutdown_after option to recovery
2014-03-18 19:31:31 +00:00
Doug Zongker
bacf9b4558
add --shutdown_after option to recovery
...
The "--shutdown_after" option causes recovery to power down the device
on completion rather than rebooting.
Removes the last vestiges of the "--previous_runs" argument, which
doesn't seem to be used for anything.
Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
Conflicts:
recovery.cpp
2014-03-18 12:20:41 -07:00
Doug Zongker
b4bbf8878c
resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp
...
Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3
2014-03-18 10:56:32 -07:00
Doug Zongker
a7d211c6ad
resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp
...
Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
2014-03-18 10:54:31 -07:00
Doug Zongker
708aa23801
Merge "add --shutdown_after option to recovery"
2014-03-18 17:39:10 +00:00
Doug Zongker
b1d1263453
add --shutdown_after option to recovery
...
The "--shutdown_after" option causes recovery to power down the device
on completion rather than rebooting.
Removes the last vestiges of the "--previous_runs" argument, which
doesn't seem to be used for anything.
Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
2014-03-18 10:32:12 -07:00
Doug Zongker
7425d035ef
am 47c7e365: am 130a7985: Merge "fix error log statement"
...
* commit '47c7e365071f75489604b2d0ba3109fe39bac1ef':
fix error log statement
2014-03-18 00:02:38 +00:00
Doug Zongker
47c7e36507
am 130a7985: Merge "fix error log statement"
...
* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
fix error log statement
2014-03-17 23:57:40 +00:00
Doug Zongker
2b3737224e
am 130a7985: Merge "fix error log statement"
...
* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
fix error log statement
2014-03-17 23:57:40 +00:00
Doug Zongker
130a798538
Merge "fix error log statement"
2014-03-17 23:52:35 +00:00
Doug Zongker
a388a76976
fix error log statement
...
We were printing the address of channels instead of the value there.
Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
2014-03-17 16:51:47 -07:00
Doug Zongker
a68c517c62
am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp
...
* commit '80c1a386d3f614919708b37986919ecaf74ee738':
refactor image resource loading code in minui
2014-03-17 23:33:14 +00:00
Doug Zongker
c4025e90f4
resolved conflicts for merge of d90da130 to klp-dev-plus-aosp
...
Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
2014-03-17 16:13:08 -07:00
Doug Zongker
80c1a386d3
resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp
...
Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
2014-03-17 16:11:02 -07:00
Mark Salyzyn
76b245c24c
minzip: 64 bit build issue
...
Regression - verification and extraction on memory, not files
Bug: 12188746
Change-Id: Ib6facc4aff6be3a31a7d184ef1c493fdd4012c21
2014-03-17 16:05:12 -07:00
Doug Zongker
d90da13076
Merge "refactor image resource loading code in minui"
2014-03-17 22:56:47 +00:00
Doug Zongker
a418aa7dd5
refactor image resource loading code in minui
...
Reduce the number of copies of libpng boilerplate. Rename
res_create_* functions to be more clear. Make explicit the use of the
framebuffer pixel format for images, and handle more combinations of
input and output (eg, loading a grayscale image for display rather
than use as a text alpha channel).
Change-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846
2014-03-17 12:27:08 -07:00
Mark Salyzyn
679baa06b7
am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"
...
* commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49':
Recovery 64-bit compile issues
2014-03-14 21:35:41 +00:00
Mark Salyzyn
52d0b765ab
am 026ebe02: Merge "Recovery 64-bit compile issues"
...
* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
Recovery 64-bit compile issues
2014-03-14 21:02:33 +00:00
Mark Salyzyn
4b6de1ba1c
am 026ebe02: Merge "Recovery 64-bit compile issues"
...
* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
Recovery 64-bit compile issues
2014-03-14 20:59:56 +00:00
Mark Salyzyn
026ebe0214
Merge "Recovery 64-bit compile issues"
2014-03-14 20:53:41 +00:00
Mark Salyzyn
f3bb31c32f
Recovery 64-bit compile issues
...
Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
2014-03-14 13:51:39 -07:00
Doug Zongker
d6e6303df4
am a7266ef0: Merge "separate fbdev-specific code out from minui"
...
* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
separate fbdev-specific code out from minui
2014-03-13 15:46:53 +00:00
Doug Zongker
4048200cd6
am c91612d4: Merge "remove pixelflinger from recovery"
...
* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
remove pixelflinger from recovery
2014-03-13 15:46:53 +00:00
Doug Zongker
546f357d03
am 8f087d02: Merge "update tools for making recovery images"
...
* commit '8f087d024619467de8609656e8a14370f24b817c':
update tools for making recovery images
2014-03-13 15:46:53 +00:00
Doug Zongker
8e7bccd9a4
am 59508993: Merge "allow CheckKey to request mounting /system"
...
* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
allow CheckKey to request mounting /system
2014-03-13 15:46:52 +00:00
Doug Zongker
cfcec9e1d4
Merge commit 'ea868b38' into manualmerge
...
Conflicts:
screen_ui.cpp
screen_ui.h
Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
2014-03-13 08:44:07 -07:00
Doug Zongker
679be48720
am 239fb930: am a7266ef0: Merge "separate fbdev-specific code out from minui"
...
* commit '239fb930e4d91de5d3a66997d32d43414055d40e':
separate fbdev-specific code out from minui
2014-03-12 20:34:25 +00:00
Doug Zongker
cb2bf046f5
am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery"
...
* commit 'cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f':
remove pixelflinger from recovery
2014-03-12 20:34:25 +00:00
Doug Zongker
b3a584f162
am 7003ff3b: am 8f087d02: Merge "update tools for making recovery images"
...
* commit '7003ff3b54e9081dba92ecfea0594355af40e6dd':
update tools for making recovery images
2014-03-12 20:28:58 +00:00
Doug Zongker
e319a0d08e
am aa6b8026: (-s ours) am 59508993: Merge "allow CheckKey to request mounting /system"
...
* commit 'aa6b8026ed5ae32f10b948edd26e3f489ba20751':
allow CheckKey to request mounting /system
2014-03-12 20:28:58 +00:00
Doug Zongker
4fff5aa7dc
am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp
...
* commit 'c15b7865badc3ac406a7ce978baa65151a50bb55':
change how recovery animation is implemented
2014-03-12 20:11:06 +00:00
Doug Zongker
239fb930e4
am a7266ef0: Merge "separate fbdev-specific code out from minui"
...
* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
separate fbdev-specific code out from minui
2014-03-12 02:42:57 +00:00
Doug Zongker
cb1bdc9e42
am c91612d4: Merge "remove pixelflinger from recovery"
...
* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
remove pixelflinger from recovery
2014-03-12 02:42:57 +00:00
Doug Zongker
7003ff3b54
am 8f087d02: Merge "update tools for making recovery images"
...
* commit '8f087d024619467de8609656e8a14370f24b817c':
update tools for making recovery images
2014-03-12 02:42:57 +00:00
Doug Zongker
aa6b8026ed
am 59508993: Merge "allow CheckKey to request mounting /system"
...
* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
allow CheckKey to request mounting /system
2014-03-12 02:42:56 +00:00
Doug Zongker
c15b7865ba
resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp
...
Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1
2014-03-11 19:39:26 -07:00
Doug Zongker
a7266ef0b1
Merge "separate fbdev-specific code out from minui"
2014-03-11 23:02:49 +00:00
Doug Zongker
5290f2087a
separate fbdev-specific code out from minui
...
Isolate the code that interacts with fbdev, in preparation for adding
a new backend.
Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
2014-03-11 14:56:41 -07:00
Doug Zongker
c91612d466
Merge "remove pixelflinger from recovery"
2014-03-11 21:55:48 +00:00
Doug Zongker
16f97c3961
remove pixelflinger from recovery
...
Recovery now draws directly to the framebuffer by rolling its own
graphics code, rather than depending on libpixelflinger.
The recovery UI is modified slightly to eliminate operations that are
slow with the software implementation: when the text display / menu is
turned on, it now appears on a black background instead of a dimmed
version of the recovery icon.
There's probably substantial room for optimization of the graphics
operations.
Bug: 12131110
Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595
Conflicts:
minui/resources.c
2014-03-11 14:40:04 -07:00
Doug Zongker
8f087d0246
Merge "update tools for making recovery images"
2014-03-11 21:34:32 +00:00
Doug Zongker
3ceeb580eb
update tools for making recovery images
...
We no longer render animations as a base image with a
possibly-partially-transparent overlay drawn over it, so delete the
make-overlay.py tool. Now we represent them as series of images that
are interlaced by row (with a special text chunk in the PNG file
specifying the number of frames) so add the interlace-frames.py tool
to make those.
Change-Id: I866db269107a21351c3df3b4683f233f72234334
2014-03-11 14:29:50 -07:00
Doug Zongker
5950899369
Merge "allow CheckKey to request mounting /system"
2014-03-11 21:21:33 +00:00