Commit Graph

711 Commits

Author SHA1 Message Date
Doug Zongker d2fb4ed589 am d27aa76a: Merge "Support BGRA framebuffer"
* commit 'd27aa76a6ff6436cfb8340bf3d04aba186cc4de1':
  Support BGRA framebuffer
2014-05-13 22:15:14 +00:00
Doug Zongker d27aa76a6f Merge "Support BGRA framebuffer" 2014-05-13 22:09:40 +00:00
Daniel Leung f766396d99 Support BGRA framebuffer
The re-designed recovery graphics code only supports RGB{_,X,A}
framebuffer, and this patch adds support for BGRA framebuffer.

Change-Id: I3780c8288088f497fa248f3492c54f43834a8598
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com>
Tested-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
2014-05-13 15:00:40 -07:00
Doug Zongker 34ff5fe3f5 am 74b90b30: Merge "screen_ui: Initialize text buffer"
* commit '74b90b309f67dc3b8bb74e47c4eddf7ce511bc35':
  screen_ui: Initialize text buffer
2014-05-13 17:28:54 +00:00
Doug Zongker 74b90b309f Merge "screen_ui: Initialize text buffer" 2014-05-13 17:25:52 +00:00
Greg Hackmann 1cd5242349 am 1c2cf1db: Merge "recovery: minui: add adf backend"
* commit '1c2cf1db0db2c9e9310d27bdc19c605f5537b72f':
  recovery: minui: add adf backend
2014-05-02 23:20:14 +00:00
Greg Hackmann 1c2cf1db0d Merge "recovery: minui: add adf backend" 2014-05-02 23:15:54 +00:00
Bill Yi 29759e9d51 Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEAD 2014-04-29 11:32:53 -07:00
Greg Hackmann 41909ddefb recovery: minui: add adf backend
Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-04-25 15:47:34 -07:00
Sasha Levitskiy 558f2700e1 Merge "Change filesystem add entry API call." 2014-04-11 23:54:14 +00:00
Sasha Levitskiy 85ef47dd84 Change filesystem add entry API call.
Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee

Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-11 21:13:26 +00:00
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
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 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 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 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 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 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 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
Doug Zongker 4db31d20c9 allow CheckKey to request mounting /system
Also provide a default implementation of CheckKey that's reasonable
for many devices (those that have power and volume keys).

Change-Id: Icf6c7746ebd866152d402059dbd27fd16bd51ff8
2014-03-11 14:19:48 -07:00
Doug Zongker ea868b3846 Merge "change how recovery animation is implemented" 2014-03-11 21:18:56 +00:00
Doug Zongker 469954fe3d change how recovery animation is implemented
Instead of one 'base' installing image and a number of overlay images
that are drawn on top of it, we represent the installing animation
with one PNG that contains all the animation frames, interlaced by
row.  The PNG is expected to have a text chunk with the keyword
'Frames' and a value that's the number of frames (as an ascii
string).  This representation provides better compression, removes the
need to subclass ScreenRecoveryUI just to change the position of the
overlay or number of frames, and doesn't require gr_blit() to support
an alpha channel.

We also remove the 'indeterminate' progress bar used when wiping data
and/or cache.  The main animation serves the same purpose (showing
that the device is still alive); the spinning progress bar has been
redundant for a while.

This changes the default recovery animation to include the
antenna-wiggling and gear-turning that's used in the Nexus 5 recovery
animation.

Change-Id: I51930a76035ac09969a25472f4e572b289418729

Conflicts:
	screen_ui.cpp
	screen_ui.h
2014-03-11 14:06:35 -07:00
Doug Zongker be7eea0a88 am 2f173bde: Merge "ADB sideload command not work"
* commit '2f173bde6584f4c560ecc3f13f6e890f52815050':
  ADB sideload command not work
2014-03-11 18:08:39 +00:00
Benoit Goby 7f1f286f45 am ac189bf6: Merge "recovery: Fix adb with linux 3.10"
* commit 'ac189bf645123b4dc79cd2053f5eb07917774d66':
  recovery: Fix adb with linux 3.10
2014-03-07 23:19:17 +00:00
Colin Cross a8554c71a3 am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"
* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
  recovery: fix building with pointer-to-int errors turned on
2014-03-07 02:23:39 +00:00
Doug Zongker 2f173bde65 Merge "ADB sideload command not work" 2014-02-26 22:17:57 +00:00
Benoit Goby ac189bf645 Merge "recovery: Fix adb with linux 3.10" 2014-02-20 22:32:32 +00:00
Benoit Goby 1b9641127c recovery: Fix adb with linux 3.10
In kernel 3.10, f_adb has been removed and adbd can use functionfs
instead. Mount functionfs on boot for adbd. On older kernels, mount
will fail silently and adbd will revert to f_adb.

Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
2014-02-19 17:48:49 -08:00
Colin Cross a5d105e239 Merge "recovery: fix building with pointer-to-int errors turned on" 2014-02-06 02:14:22 +00:00
Colin Cross 92cdf9c372 recovery: fix building with pointer-to-int errors turned on
Use intptr_t/uintptr_t to cast between pointer and int to allow
building with -Werror=pointer-to-int-cast and
Werror=int-to-pointer-cast turned on.

Cast to char* instead of unsigned int for pointer arithmetic.

Change-Id: Ia862306fdcca53866b330e8cf726f3d62f2248a0
2014-02-05 17:34:45 -08:00
Colin Cross fd84f65dcd am f3532072: Merge "minadbd: remove dead code"
* commit 'f353207298ed14d0e6943353dd9788421a7537b8':
  minadbd: remove dead code
2014-01-27 12:40:26 -08:00