Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-plus-aosp
* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
backout a workaround that is not needed anymore
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-plus-aosp
* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp
* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
* changes:
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-plus-aosp
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
* changes:
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.
Part of the fix for b/2243198 (Black screen lockup after ending call)
Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
* changes:
docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-plus-aosp
* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-plus-aosp
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Don't hold the global package log while instantiated an AssetManager+Resources, since
this is a fairly heavy-weight operation, and if done in the background can starve the
foreground.
Change-Id: I5ad37324fb7c27ffdbf28e1498ca0ad667479580
Due to a change in cpu stepping values, the batterystats.bin file needs to
be wiped for Battery Use app to show CPU cost correctly.
Bumping up the version number of the file fixes this.
This is an uber hack. Since there is a race between resizing the view and getting
the orientation-changed notification, this just tries to avoid drawing the tabs in the
wrong orientation (based on what we *expect* to be the orientation specified in the layout
file for the SlidingTab). This masks the problem *most* of the time.
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-plus-aosp
* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
Add vertical bar to the alt-space character picker for the hardware keyboard.
