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
Michael Runge
aa1a31e83d
Allow lines without = signs.
...
The new build.prop for Sprout includes lines of the format:
import xxx.prop
These can be safely ignored when reading the property file.
Change-Id: Ia84a138e71461ffe8e591e88143b9787873def29
2014-05-01 18:37:40 -07:00
Bill Yi
ff5fc6c809
am ddaaccb3
: am 29759e9d
: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD
...
* commit 'ddaaccb3db623ff6f19b7dadf51d41cc46bb05c3':
2014-04-30 00:52:59 +00:00
Bill Yi
ddaaccb3db
am 29759e9d
: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD
...
* commit '29759e9d518880adba366c502cf79d53c48a31bb':
2014-04-30 00:49:24 +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
Benoit Goby
5ec6f4daaf
am 9e8d81ba
: am 0e22af65
: recovery: Fix adb with linux 3.10
...
* commit '9e8d81ba96b299cc084723797d9f492d4441d57a':
recovery: Fix adb with linux 3.10
2014-04-18 19:16:11 +00:00
Benoit Goby
9e8d81ba96
am 0e22af65
: recovery: Fix adb with linux 3.10
...
* commit '0e22af658c89fb53ab1215a3538bbaf10d733ad9':
recovery: Fix adb with linux 3.10
2014-04-18 19:12:40 +00:00
Benoit Goby
0e22af658c
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.
Bug: 14160609
Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
2014-04-18 12:05:30 -07:00
Sasha Levitskiy
346e11816d
am ecf1f6c9
: am 558f2700
: Merge "Change filesystem add entry API call."
...
* commit 'ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819':
Change filesystem add entry API call.
2014-04-12 00:02:32 +00:00
Sasha Levitskiy
ecf1f6c929
am 558f2700
: Merge "Change filesystem add entry API call."
...
* commit '558f2700e18d50cf8e798254200ef37f7a09678d':
Change filesystem add entry API call.
2014-04-12 00:00:02 +00: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
9551cf9121
make density-specific recovery assets
...
Provide different recovery UI resources for different display
densities. Right now only the text images and the progress bars are
rescaled; the main icon will get scaled when it's updated for QP.
Lightly quantum-ify the rest of the recovery interface. (Light
background, progress bars, etc.)
Change-Id: Ia639c4ce8534b01bc843524efbc4b040c1cf38b3
2014-04-04 13:48:33 -07:00
Doug Zongker
8d9d3d5cbe
add reboot-to-bootloader and power down options to recovery menu
...
Useful when debugging or developing for recovery.
Change-Id: Ic3ab42d5e848ad3488f1c575339b55e45c8a024b
2014-04-01 13:20:23 -07:00
Doug Zongker
02abde5085
remove DefaultDevice's UI subclass
...
RecoveryUI (which is the superclass of ScreenRecoveryUI), provides a
basic CheckKey method that is useful for devices that have KEY_POWER,
KEY_VOLUMEUP, and KEY_VOLUMEDOWN. Stop overriding it with a less
featureful method; with this no recovery UI customization is needed
for most handheld devices (phones, tablets, etc.).
Change-Id: I7d57cfaaef79afea8af4fc3dbc570afc61aeb5bc
2014-04-01 09:47:36 -07:00
Paul Lawrence
276f37e4d4
Merge "Fix build break caused by vold change"
2014-03-21 20:11:09 +00:00
Doug Zongker
3e1cadc8f5
am 03008bc1
: am aa4545b5
: Merge "restore minui support for paletted images with < 8 bits"
...
* commit '03008bc1e89a780e382abe0567e709daecce92ff':
restore minui support for paletted images with < 8 bits
2014-03-20 21:05:12 +00:00
Doug Zongker
03008bc1e8
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:33 +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
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