Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'
* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187'
* commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'
* commit '41029cf413abbfdf004e04f192a440e457701c47':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp
* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
Modify vCard exporter code so that it does not emit non-Ascii type.
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>
Merge commit '4373346073250b668c0ff287b0d584401f7f3c96' into eclair-mr2-plus-aosp
* commit '4373346073250b668c0ff287b0d584401f7f3c96':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2
* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b' into eclair-mr2-plus-aosp
* commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp
* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
Create android-common static library which gets included in frameworks.jar,
* changes:
Create android-common static library which gets included in frameworks.jar, but can also be used by unbundled apps. Move android.text.util.Regex there as a starting example, renamed to a more sensible (?) com.android.common.Patterns. Set up a corresponding test package, and move RegexTest (to PatternsTest). Update clients.
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
Merge commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11'
* commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11':
Do not grow the viewport width to infinite to fit
Merge commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25' into eclair-mr2-plus-aosp
* commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25':
Do not grow the viewport width to infinite to fit
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.
the content. Limit the overview viewport width to
a level that if a site behaves badly, the WebView
still does reasonably.
Partially fix http://b/issue?id=2209659
maps.yahoo.com keeps growing due to a layout bug.
This prevents the browser to go insane.
Partially fix http://b/issue?id=2215387
caltrain.com has a super long which caused
the page super wide. This prevents the browser to
become unusable.
This change will make sites like, caltrain.com/timetable.html
not fit all in the view. You have to scroll left
and right. And it is same as iPhone.
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 '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74'
* commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74':
resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp
Merge commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06'
* commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06':
Add vertical bar to the alt-space character picker for the hardware keyboard.
