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 '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 '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
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.
Merge commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435' into eclair-mr2-plus-aosp
* commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2
* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit '4fea2919abeba149376fed98a14e3ffc8464eadf' into eclair-mr2-plus-aosp
* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
Check if Bluetooth is enabled before making any calls down.
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2
* commit '660282dc3e81784224945be0787a9e2d4276de8c':
Check if Bluetooth is enabled before making any calls down.
Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp
* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
Clean up codes and remove/modify stale codes/comments.
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp
* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.
Make Constants public and rename it to VCardConstants.
Internal issue number: 2242528, 2195990
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static. A lot of code used it like it was per-instance,
but this would actually block all instances. This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.
Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
Merge commit 'f016fa632b1d3c606934bc11a889af3921c6120e' into eclair-mr2-plus-aosp
* commit 'f016fa632b1d3c606934bc11a889af3921c6120e':
Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Merge commit 'a57632fee792d6078a7a61006f5a866c38addd33' into eclair-mr2-plus-aosp
* commit 'a57632fee792d6078a7a61006f5a866c38addd33':
Fix bugs around removing and attaching WebViews.
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp
* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
Rename several files so that readers would not be confused.
