Merge commit '7dc642d0b9f9395221818978d2cd9143cd3cad36' into eclair-mr2-plus-aosp
* commit '7dc642d0b9f9395221818978d2cd9143cd3cad36':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '148f666b0a10183afc987809482f18d8199d747c' into eclair-mr2-plus-aosp
* commit '148f666b0a10183afc987809482f18d8199d747c':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-mr2
* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2
* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
Use separate flags for enabling hardware and software auto-brightness.
For framework light sensor support (does not affect hardware based approach).
Change-Id: I6896a7c5b3fd3ed136c4f25c63a0e5813c349f68
Signed-off-by: Mike Lockwood <lockwood@android.com>
This cleans up the code in preparation for some other auto-brightness changes
and fixes support for devices without light sensors.
Change-Id: I3d4802cf860a865ffd86a8bb57cd57b46359433d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp
* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
Add a privateImeOption to represent that the IME should not show
Merge commit 'cbf583d7229aaff65734b4234e81db8ead864761' into eclair-mr2-plus-aosp
* commit 'cbf583d7229aaff65734b4234e81db8ead864761':
Turns out the SGX driver is correct and the bug was in this test.
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2
* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
Add a privateImeOption to represent that the IME should not show
* changes:
Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2
* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
Turns out the SGX driver is correct and the bug was in this test.
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).
The IME will respect this shortly.
http://b/2228562
Merge commit 'd85545d0b4c92cceafafce98f246483de5c4903e' into eclair-mr2-plus-aosp
* commit 'd85545d0b4c92cceafafce98f246483de5c4903e':
fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2
* commit 'd01767f8b7038108f9125cd2122b117db9919824':
fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger, without including
gralloc_priv.h
Merge commit 'a823534008afa45f61faca4088c5aabe9b956117' into eclair-mr2-plus-aosp
* commit 'a823534008afa45f61faca4088c5aabe9b956117':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2
* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp
* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
Revert the channge where channels were not selected randomly.
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Temporarily make a function public that doesn't need to be. When
host gcc-4.0.3 is gone from the build servers we can undo this.
(Cherry-picked from eclair-mr2.)
Merge commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1' into eclair-mr2-plus-aosp
* commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp
* commit 'af7d2dda809be2ce43b4b892509648857f09f5e3':
update line test to expose some bug on SGX530 ed4
Merge commit '7fb4e4aaf2137474a6abe0d95888e133d4075527' into eclair-mr2-plus-aosp
* commit '7fb4e4aaf2137474a6abe0d95888e133d4075527':
Removed javadoc link to hidden class (temporary fix for build)
