Merge commit '3c24aca5f597f2eb90e53dce450197e2f46c2305' into eclair-plus-aosp
* commit '3c24aca5f597f2eb90e53dce450197e2f46c2305':
Don't crash when adding a shortcut.
Merge commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad'
* commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad':
DO NOT MERGE; Add back support for uts testing.
Merge commit '75dc3a9d28a184358127390329b36a5a520c212c' into eclair-plus-aosp
* commit '75dc3a9d28a184358127390329b36a5a520c212c':
DO NOT MERGE; Add back support for uts testing.
normalizeIcons() was missing a call to setTransactionSuccessful(),
which made the entire DB upgrade silently rollback. So the
DB version was stuck at 6 after an upgrade from Eclair to Froyo.
The only visible effect in the default config was that the search
widget disappeared.
Fixes http://b/issue?id=2451146
Change-Id: I257964e5958286e9819bb5e7b108a261cfabf9b3
Merge commit '5d12096cd22a875d7e1652cd4f6efdcad63689a7' into eclair-plus-aosp
* commit '5d12096cd22a875d7e1652cd4f6efdcad63689a7':
Reimport Launcher2 translations. DO NOT MERGE
Merge commit '5dec4c5a9feca41bb46e1da355dfedf9fcbb5732'
* commit '5dec4c5a9feca41bb46e1da355dfedf9fcbb5732':
DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can't be merged back.
Merge commit '75fd1ec46da7708bd46183da7999ec891d63140d' into eclair-plus-aosp
* commit '75fd1ec46da7708bd46183da7999ec891d63140d':
DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can't be merged back.
This thing where the context sometimes works and sometimes doesn't is starting to piss me off. We
really need to have RenderScriptActivity that deals with the lifecycle for you...
Merge commit 'b8fc9e7df69db4b1647ef780f5620836c86f70ea' into eclair-plus-aosp
* commit 'b8fc9e7df69db4b1647ef780f5620836c86f70ea':
Launcher changes to handle UTS test mode.
When in UTS test mode keys received need to be handled
by the Phone application or Contacts application to
operate properly in the test mode. When not in test mode
the search widget will handle the keys as it was before
this change.
The UTS test mode is enabled when presist.sys.uts-test-mode is 1.
bug: 2402366
Change-Id: I58e68830f9ce6905e189ecba1c04b1076799a0a0
Signed-off-by: Wink Saville <wink@google.com>
Merge commit 'f80592cc642828c5c1e4638f5d495d186c4b3e6c'
* commit 'f80592cc642828c5c1e4638f5d495d186c4b3e6c':
DO NOT MERGE. Update for new RS library with ES 2.0 support.
Merge commit '52ba5b08f25e031a6f717551c75abf630b92ed8b' into eclair-plus-aosp
* commit '52ba5b08f25e031a6f717551c75abf630b92ed8b':
DO NOT MERGE. Update for new RS library with ES 2.0 support.
used for the workspace.
Consolidate the three icon resampling functions into one.
Ensure that the icons stored in LauncherProvider are the right size, so we don't have to resample
them each time we load them.
The SOURCE (search source identifier) constant is moving
from hidden in android.app.SearchManager to com.android.common.Search.
Part of http://b/issue?id=2429556
Change-Id: I68fa792f2d452aadcb9216f5c780bd082ca5039f
Merge commit '938cb839512159fb622f919271d121dfe50332b0'
* commit '938cb839512159fb622f919271d121dfe50332b0':
android-2.1_r1 snapshot
Keep banging on the launcher locks up bug. This moves the
Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
Fix bug 2258128 - homescreen on Passion unresponsive while still not leaking the contexts.
Merge commit '999b6a5ecb36405d3697f9fb11df9a5bb0273e73' into eclair-plus-aosp
* commit '999b6a5ecb36405d3697f9fb11df9a5bb0273e73':
android-2.1_r1 snapshot
Keep banging on the launcher locks up bug. This moves the
Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
Fix bug 2258128 - homescreen on Passion unresponsive while still not leaking the contexts.
Jason Sams