Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f97c39 authored by Doug Zongker's avatar Doug Zongker Committed by Doug Zongker
Browse files

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
parent 8f087d02

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ LOCAL_STATIC_LIBRARIES := \ 
    libmincrypt \

    libminadbd \

    libminui \

    libpixelflinger_static \

    libpng \

    libfs_mgr \

    libcutils \

minui/graphics.c

+302 −197

File changed.

Preview size limit exceeded, changes collapsed.

minui/minui.h

+13 −5
Original line number Diff line number Diff line
@@ -23,21 +23,29 @@ 
extern "C" {

#endif



typedef void* gr_surface;

typedef unsigned short gr_pixel;

typedef struct {

    int width;

    int height;

    int row_bytes;

    int pixel_bytes;

    unsigned char* data;

} GRSurface;



typedef GRSurface* gr_surface;



int gr_init(void);

void gr_exit(void);



int gr_fb_width(void);

int gr_fb_height(void);

gr_pixel *gr_fb_data(void);



void gr_flip(void);

void gr_fb_blank(bool blank);



void gr_clear();  // clear entire surface to current color

void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

void gr_fill(int x1, int y1, int x2, int y2);

int gr_text(int x, int y, const char *s, int bold);

void gr_text(int x, int y, const char *s, int bold);

void gr_texticon(int x, int y, gr_surface icon);

int gr_measure(const char *s);

void gr_font_size(int *x, int *y);

minui/resources.c

+33 −64

File changed.

Preview size limit exceeded, changes collapsed.

mtdutils/flash_image.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
#include "cutils/log.h"

#include "mtdutils.h"



#ifdef LOG_TAG

#undef LOG_TAG

#endif

#define LOG_TAG "flash_image"



#define HEADER_SIZE 2048  // size of header to compare for equality