Commit Graph
7512 Commits
Author SHA1 Message Date
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
bigbiff bigbiff ec8fc28866 Change to lstat so we don't count the target of symbolic links as part
of the tar archive size. Big thanks to Tassadar for pointing out the
fix.

Change-Id: I8894ffef54c93939b5b455634169d9c14d8ed7af
2014-03-16 20:32:50 -04: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
Ethan Yonker c05c598b73 Improve handling of settings storage and android secure
Change-Id: I8af92543c2f0c201e7220267c417d74e4561038d
2014-03-13 09:19:56 -05:00
Dees Troy 863ecff610 Merge "Fix skipping of relative paths and lost+found in twrpDU" into android-4.4 2014-03-13 15:17:17 +01:00
Vojtech Bocek 05f87d6cca Fix skipping of relative paths and lost+found in twrpDU
Change-Id: Ib79029fd6237502338b041a6bc2f9e539536d6ad
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2014-03-13 14:55:12 +01: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
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 18f72dc551 Merge "separate fbdev-specific code out from minui" 2014-03-11 20:39:22 +00:00
Doug Zongker 830b3e3363 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 13:22:04 -07:00
Doug Zongker 5120c9fbb6 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: I79443f125f9c7d8d61cd09e3434745e0ef38893f
2014-03-11 12:39:33 -07:00
Vojtech Bocek 2005a84b24 Run TWFunc::Fixup_Time_On_Boot() before OpenRecoveryScript
* Fixes possible issues with names of backups made with ORS

Change-Id: If8da1b3abb0960e527bb0eb3dd8a04d184aaea4d
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2014-03-11 19:40:34 +01:00
Doug Zongker 39cf417e17 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
2014-03-11 11:10:00 -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
Dees Troy 99c8dbf215 Check to ensure that selinux_handle is populated before using
Change-Id: I6de4c5db3e3183229d7029fc72b957c7ef61f23a
2014-03-10 16:54:21 +00:00
Dees Troy 2f6e995b39 Merge "Fix incorrect alignment of Restore Defaults button in some themes" into android-4.4 2014-03-10 16:29:06 +01:00
Kra1o5 781e689f37 Fix incorrect alignment of Restore Defaults button in some themes
Change-Id: I11bd9fea2a900a92794c5c297846eb87265eeee7
2014-03-10 00:37:26 +01:00
that 7e303cfeb8 Support pre-KitKat properties for update-binary
Google changed the in-memory format for storing properties in 4.4.
Zips containing an older update-binary expect the old format, otherwise
assertions on properties in the update script fail.

This is just enough of the old property service to copy the properties
to the legacy format before running the updater.

Change-Id: I404680384bdc5e952609e295029ab0a0faf743a5
2014-03-09 23:17:15 +01: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
Ethan Yonker eae4209443 Fix error handling in createList
Change-Id: I10211f2a20da119ae6a4a1bb2f768a3fa2ab87da
2014-03-07 15:33:13 -06:00
Doug Zongker eac881c952 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
2014-03-07 09:45:44 -08:00