Merge commit '5af4cf47b94383deb47648240036c7090f46fd41' into eclair-mr2-plus-aosp
* commit '5af4cf47b94383deb47648240036c7090f46fd41':
add dpad control of text selection for sholes
Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp
* commit '32de91306233b08604ce7a158a37235c7042ae13':
Fix high density bug 2179543: use 'dip' instead of 'px'
WebView.mHeldMotionless should only be set to MOTIONLESS_FALSE
if some scrolling occurs, even in the case where motion is discarded
by snap-scroll mode.
Refactoring the code allows the code to be smaller, and provides
a single point where scrollBy() is called while dragging.
This doesn't change the snap-scroll logic in any way.
related to http://b/issue?id=2092446
Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2
* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug 2179543: use 'dip' instead of 'px'
Make movement of text selection arrow and I-beam respond to
both trackball and d-pad. Make the 'click' action work for
both trackball-up and d-pad center.
fixes http://b/issue?id=2186069
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp
* commit '12a19551dd106b04898d262807213ce4c6d1e5f7':
If openOrCreateDatabase() throws an exception, delete
* changes:
If openOrCreateDatabase() throws an exception, delete the old db and re-do it. If it still fails, something bad happens, like the directory may have the different permission. Let it throw as WebView needs the db.
Merge commit 'b0219b5aadd9271daa316c47202a849e02adeb7f'
* commit 'b0219b5aadd9271daa316c47202a849e02adeb7f':
Power Manager support for light sensor backlight management.
Merge commit '2312b65ddf3b9bff11fc31caef8d145faed106ea'
* commit '2312b65ddf3b9bff11fc31caef8d145faed106ea':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533' into eclair-mr2-plus-aosp
* commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533':
Power Manager support for light sensor backlight management.
Merge commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6' into eclair-mr2-plus-aosp
* commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-mr2
* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
Merge commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-mr2
* commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1':
Log exception if we hit an error parsing an incoming SMS message.
Fix problem with ignored sensor events right after screen turns on.
Do not flash button backlights when device is booting.
Process the first light sensor change after waking the screen immediately rather than debouncing.
Cancel mAutoBrightnessTask when light sensor is disabled.
Change-Id: Iffc5e090b239432b7643812fa8ecb5f69da1679d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Merge commit '18dc8826a2c7244a7a61c9c53113516416db4714'
* commit '18dc8826a2c7244a7a61c9c53113516416db4714':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6' into eclair-mr2-plus-aosp
* commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2
* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74'
* commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74':
Proper fix for zero signal strength and no_service. Fixes#2176141
Fiddle around with the offsets of wallpapers to have better defaults, and
update the offset when the currently wallpaper target is not setting an
offset itself.
Change-Id: I1864d098fb4813fb0c67857af8ebf398b35e6876
