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.
When removing a WebView from its Window, remove the WebTextView.
Remove the old attempt to do the same, which was not being called.
When attaching a WebView to a Window, call onWindowFocusChanged so
its state of drawing the selection ring returns.
Fixes http://b/issue?id=2257787 and http://b/issue?id=2260867
Added translation animation where tab "flies" when you release.
Added translation animation where pressing and releasing one tab will hide/show the other
Added alpha animation to make target appear gradually
Added margin around swipe area to allow easier unlocking.
Removed unused handler.
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-mr2
* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-mr2
* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
Merge commit 'd1841144e4d592724001018f427806edb9c72ae0' into eclair-mr2-plus-aosp
* commit 'd1841144e4d592724001018f427806edb9c72ae0':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-mr2
* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit 'dc6563393789e90d75b44b9ce97c167863bf0771' into eclair-mr2-plus-aosp
* commit 'dc6563393789e90d75b44b9ce97c167863bf0771':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '7d7257dd9cbe38453678f2803032e283a0344424' into eclair-mr2-plus-aosp
* commit '7d7257dd9cbe38453678f2803032e283a0344424':
Fix the full-weekday date format strings to actually use the full weekday.
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-mr2
* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
Fix the full-weekday date format strings to actually use the full weekday.
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)
Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '235657dbe06c4fea8860ec9fef834a6b36da9700' into eclair-mr2-plus-aosp
* commit '235657dbe06c4fea8860ec9fef834a6b36da9700':
Removed the fixed height in the sim unlock screen's header.
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-mr2
* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
Removed the fixed height in the sim unlock screen's header.
Merge commit 'f05ec9237ec907be3f2c581a950149435bd585fb' into eclair-mr2-plus-aosp
* commit 'f05ec9237ec907be3f2c581a950149435bd585fb':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '5da824210ee34f051c295c12f6bcc4b617da4a1a' into eclair-mr2-plus-aosp
* commit '5da824210ee34f051c295c12f6bcc4b617da4a1a':
Make WRITE_GSERVICES into system-or-signature (instead of just signature),
Merge commit 'aaa8e7e633b61b221d10f21006bf2cd197004093' into eclair-mr2-plus-aosp
* commit 'aaa8e7e633b61b221d10f21006bf2cd197004093':
Add support for making a LiveWallpaper the default
Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp
* commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2':
docs: document the 'showSearchIconAsBadge" flag and
* changes:
Make WRITE_GSERVICES into system-or-signature (instead of just signature), as a temporary measure so unbundled Google components (GSF, etc.) can hold it. (In the longer term, WRITE_GSERVICES won't be a system permission at all, but it or something like it will be defined directly by GSF.)
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.
Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
