OSDN Git Service
Joe Onorato [Thu, 18 Mar 2010 03:23:53 +0000 (20:23 -0700)]
Rename these static variables.
Change-Id: Ic16dcbeb5b0c8afface65a995ea501e155ba69ff
Joe Onorato [Thu, 18 Mar 2010 03:03:24 +0000 (20:03 -0700)]
We need to null out this static.
All of the crashes we've been seeing with "Calling RS with no
Context active" were in places that are guarded with if (mRollo != null).
Change-Id: Icb9194cfc4f534bedce5a69a20760a0c3d7fe1d3
Joe Onorato [Wed, 17 Mar 2010 16:14:50 +0000 (09:14 -0700)]
Add a log message and some todos.
Change-Id: I948997d169d1833f2b61c620a02dbccae535e8de
Romain Guy [Mon, 15 Mar 2010 21:44:42 +0000 (14:44 -0700)]
Prevent NPE in Launcher when an icon cannot be found.
Bug #
2509023
Change-Id: I053c7c9a37ed4aeb4d78a9f62dfdeea09a3959aa
Jason Sams [Mon, 15 Mar 2010 19:12:53 +0000 (12:12 -0700)]
Merge "Fix stop point for physics in landscape."
Romain Guy [Sat, 13 Mar 2010 01:17:56 +0000 (17:17 -0800)]
Improve focus restore on orientation change.
Change-Id: If405c60f4a45aeb4079aa4dcd96b684fd6ea819c
Romain Guy [Sat, 13 Mar 2010 00:03:52 +0000 (16:03 -0800)]
Fix focus and touch issues in 3D all apps.
Bug #
2506026
Change-Id: I95f21cc285c17dfa5f93daafa9d90a64042c7a9d
Jason Sams [Fri, 12 Mar 2010 20:46:04 +0000 (12:46 -0800)]
Fix stop point for physics in landscape.
Change-Id: I4ca8fcf9d65746116b3c244e724344d8f90eeba0
Joe Onorato [Fri, 12 Mar 2010 01:59:11 +0000 (17:59 -0800)]
Bug
2509023 - NPE on upgrade to froyo
Change-Id: I07cb4f272948062b47da8826ca917fd74ad18404
Joe Onorato [Thu, 11 Mar 2010 23:45:05 +0000 (15:45 -0800)]
Eliminate a race where old Launcher objects will continue to get callbacks for loading if they go
away before they're done.
Change-Id: Id9f57be482da428750285c86d95114d2652064e6
Jason Sams [Thu, 11 Mar 2010 20:38:48 +0000 (12:38 -0800)]
Unbind root script around load activities to prevent commands from being delayed due to swap buffers.
Change-Id: I9720fbe936d3cd336ca39235d0a1bba9e10d137a
Joe Onorato [Thu, 11 Mar 2010 20:32:24 +0000 (12:32 -0800)]
Fix
2507267 - stack overflow when adding shortcut
Change-Id: Ife5bea443debd481854693b3924e72a04fb66f97
Joe Onorato [Wed, 10 Mar 2010 23:30:07 +0000 (15:30 -0800)]
bug
2480004 - add some descriptions for the string in home
Change-Id: Ie01900dcb6fd6381d18dcfa80bddb7bfdff19b13
Romain Guy [Thu, 11 Mar 2010 18:36:05 +0000 (10:36 -0800)]
Re-enable Proguard, supports 3D all apps correctly now.
Change-Id: I84ab56054c9f57985fec9107c3977691177b85a4
Ying Wang [Thu, 11 Mar 2010 17:53:25 +0000 (09:53 -0800)]
Turn off Proguard on Launcher2.
It will be turned on eventually, after the issue is fixed.
Change-Id: Ibd2a2d295379d14cd95d13156aa22c44be6fa7b4
Daniel Sandler [Tue, 9 Mar 2010 19:45:57 +0000 (14:45 -0500)]
Fix trackball focus weirdness in AllApps2D.
Also vertically align AllApps2D's home icon with Workspace's
grid icon.
Change-Id: I81a8759ed33afd08336482484f1b9bdb9a36718e
Romain Guy [Thu, 11 Mar 2010 03:45:00 +0000 (19:45 -0800)]
Prevent ANR in Home when changing orientation.
Bug #
2504556
This solves the issue by keeping the GL context, the RS context and
the RS scene around, across orientation changes.
Change-Id: I8e3dc6e6bf039087046d49d2826c8800c5bef582
Romain Guy [Thu, 11 Mar 2010 02:27:50 +0000 (18:27 -0800)]
Merge "Resurrect the All Apps button."
Romain Guy [Thu, 11 Mar 2010 02:26:59 +0000 (18:26 -0800)]
Resurrect the All Apps button.
Change-Id: Ic7dc985bfc1eec6d6c059ff37a61c84b8cb103de
Joe Onorato [Sun, 7 Mar 2010 19:32:10 +0000 (14:32 -0500)]
Apps on SD card don't confuse the launcher any more. They show up properly after reboots,
mounting and unmounting.
Change-Id: Icd861dcd8ac6401c597e2f9c8e2c66dff1cf9c61
Joe Onorato [Fri, 5 Mar 2010 20:05:52 +0000 (15:05 -0500)]
Refactor the app updates so that it doesn't rely on the package name.
This will be needed for the upcoming change to update the icons with the
grayed out when the SD card goes away.
Adam Powell [Wed, 10 Mar 2010 19:08:17 +0000 (11:08 -0800)]
Cancel long press within normal touch slop, before paging touch slop.
Change-Id: I1b4d02db306bc0a7c3f39e2174a7239239ce4422
Adam Powell [Wed, 10 Mar 2010 03:12:45 +0000 (19:12 -0800)]
Smoother scrolling/paging, multiple pointer support
Change-Id: I09eef7b0b4d85ab073307f2fb5eb2521aef82af4
Dianne Hackborn [Tue, 9 Mar 2010 23:03:20 +0000 (15:03 -0800)]
Allow shared user id and process to be set via overlays.
This fiddles the manifest to allow the app's shared user id and
process to be changed at build time via resource overlays, so we
can build launcher to run in the acore process for low-end devices.
Also switches the cert of launcher back to shared, to allow for
this. (Note this only really matters if the shared user id is set,
otherwise launcher will still get its own uid.)
Change-Id: I0bd0a06e1442c4bfe5ceb2d438cb58f29d911578
Daniel Sandler [Tue, 9 Mar 2010 19:49:13 +0000 (11:49 -0800)]
Merge "Updated mdpi art."
Ying Wang [Tue, 9 Mar 2010 17:19:52 +0000 (09:19 -0800)]
Merge "Enable Proguard on Launcher2."
Daniel Sandler [Tue, 9 Mar 2010 16:00:12 +0000 (11:00 -0500)]
Updated mdpi art.
Bug:
2485104
Change-Id: I6a84768f45141528361eaee1f0ce4b37e50ca487
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:05:04 +0000 (18:05 -0800)]
Add an empty CleanSpec.mk
Change-Id: If0c55c46602c610c68d42b62796d6784dad97c0e
Jason Sams [Tue, 9 Mar 2010 01:03:51 +0000 (17:03 -0800)]
Give up on caching the computed animation state as it keeps causing bugs
where we don't correctly re-initialize it when starting in various states.
Change-Id: Id648c7bba5d8b55a32b5b33363ddf6e74701df87
Daniel Sandler [Mon, 8 Mar 2010 19:41:21 +0000 (14:41 -0500)]
Speed up 2D AllApps fade-in.
Change-Id: I466c97cb63687ec3dab5109a8e77445e78e8b3ee
Jason Sams [Fri, 5 Mar 2010 21:24:31 +0000 (13:24 -0800)]
Move mipmap level generation from allocation creation to upload time. This prevents RS from storing the >0 mipmap levels.
Kenny Root [Fri, 5 Mar 2010 21:43:30 +0000 (13:43 -0800)]
Merge "Widen AllApps3D text to match Launcher"
Kenny Root [Fri, 5 Mar 2010 21:24:08 +0000 (13:24 -0800)]
Widen AllApps3D text to match Launcher
The AllApps3D text used to have a bubble shade for the application
title to make it more visible over a translucent background of the
desktop. This was later changed to a black background eliminating
the need for the bubble surrounding the text. The majority of the
bubble rectangle code was commented out leaving all of the padding
still in effect. This caused application titles to wrap in varying
places between Launcher and Launcher2. Padding changes solve this.
Change-Id: Id67649562045f65b44409dfb81e6112a1f838143
Daniel Sandler [Fri, 5 Mar 2010 16:04:10 +0000 (11:04 -0500)]
Use the right package name to find wallpaper resources.
Bug:
2489120
Change-Id: I7efb122916edfb467c02969f29d845ebf29f74bf
Daniel Sandler [Fri, 5 Mar 2010 16:02:55 +0000 (11:02 -0500)]
Swap in the classic Android wallpapers in mdpi.
hdpi devices will see the Nexus wallpapers; mdpi devices
will see the old wallpapers.
Change-Id: If019eb90e9d67ede7865a8ea9f7a330d43a664ab
Daniel Sandler [Fri, 5 Mar 2010 13:47:27 +0000 (05:47 -0800)]
Merge "Change the way 2D/3D AllApps are selected."
Romain Guy [Fri, 5 Mar 2010 02:59:31 +0000 (18:59 -0800)]
Make touch events work in landscape.
Daniel Sandler [Thu, 4 Mar 2010 20:10:54 +0000 (15:10 -0500)]
Change the way 2D/3D AllApps are selected.
all_apps.xml is now a trampoline that loads the correct layout file.
Also take this opportunity to make 2D the default.
Change-Id: Iba2500da1bf4f505f1a5c2f6f32ed6e72ec34c5f
Romain Guy [Thu, 4 Mar 2010 21:03:17 +0000 (13:03 -0800)]
Fix the build!
Romain Guy [Thu, 4 Mar 2010 20:52:16 +0000 (12:52 -0800)]
Merge "Prevent crash when a bad widget launches a non-existent config activity."
Romain Guy [Thu, 4 Mar 2010 20:51:36 +0000 (12:51 -0800)]
Prevent crash when a bad widget launches a non-existent config activity.
Romain Guy [Thu, 4 Mar 2010 20:15:37 +0000 (12:15 -0800)]
Make the Home on screen button work in landscape.
Romain Guy [Thu, 4 Mar 2010 20:07:31 +0000 (12:07 -0800)]
Update launcher's namespace.
Romain Guy [Thu, 4 Mar 2010 19:57:50 +0000 (11:57 -0800)]
Rename Launcher2's package to com.android.launcher.
This should fix data migration issues.
Romain Guy [Thu, 4 Mar 2010 18:07:38 +0000 (10:07 -0800)]
Implement landscape in 3D all apps.
Bug #
2454737
Bug #
2454736
Daniel Sandler [Thu, 4 Mar 2010 17:19:30 +0000 (12:19 -0500)]
More mdpi artwork.
Change-Id: I53f7985a2fe0dc4e61143242c110f3604e8ed1a1
Daniel Sandler [Thu, 4 Mar 2010 14:18:37 +0000 (09:18 -0500)]
New mdpi artwork for L2.
Change-Id: Ie4b209a3cda914a547b0fc6abfc81a0a681aa5ee
Ying Wang [Thu, 4 Mar 2010 00:33:36 +0000 (16:33 -0800)]
Enable Proguard on Launcher2.
Jean-Baptiste Queru [Wed, 3 Mar 2010 20:44:28 +0000 (12:44 -0800)]
Merge "Switch to Launcher2 for all builds."
Daniel Sandler [Wed, 3 Mar 2010 20:05:19 +0000 (15:05 -0500)]
Hide the workspace when launching AllApps2D.
Boosts performance and squashes some weird focus issues.
(Also: fix builds with AllApps3D)
Change-Id: Id1c4628e119c950dced9d3383993674f3d6b9a1c
Daniel Sandler [Tue, 2 Mar 2010 19:08:08 +0000 (14:08 -0500)]
Introduce 2D All Apps and other support for sapphire-class devices.
AllAppsView is now the 2D, GridView-based version (very
similar to classic Launcher); AllApps3D is the
RenderScript/Rollo implementation.
TODO:
- some mdpi assets are not in fact mdpi
- related to above: static wallpapers not working yet
- add dynamic selection of 2D/3D AA; currently you must
choose one at build time by picking the appropriate class
in all_apps.xml (see separate CL for sapphire overlay
that does this)
Change-Id: I253d98404ea8a329a4049d2e48edd2e5129fa6ba
Jean-Baptiste Queru [Wed, 3 Mar 2010 19:27:21 +0000 (11:27 -0800)]
Switch to Launcher2 for all builds.
Change-Id: Ie5563bf09ebd79cdd94e4c3bd1961807e7bb3693
Ying Wang [Tue, 2 Mar 2010 17:37:26 +0000 (09:37 -0800)]
Merge "Fix Proguard flags."
Joe Onorato [Tue, 2 Mar 2010 02:34:15 +0000 (18:34 -0800)]
Joe Onorato [Tue, 2 Mar 2010 01:57:23 +0000 (17:57 -0800)]
am
4700fed7: Maybe this will silence b/
2460740
Merge commit '
4700fed72b619a09a0d9cac93e86625b95c730dc' into eclair-plus-aosp
* commit '
4700fed72b619a09a0d9cac93e86625b95c730dc':
Maybe this will silence http://b/
2460740
Joe Onorato [Mon, 1 Mar 2010 23:26:36 +0000 (15:26 -0800)]
Maybe this will silence http://b/
2460740
Romain Guy [Mon, 1 Mar 2010 18:15:39 +0000 (10:15 -0800)]
Fix folders asset.
Bug #
2478416
Eric Fischer [Sat, 27 Feb 2010 01:31:07 +0000 (17:31 -0800)]
Import new translations.
Jason Sams [Fri, 26 Feb 2010 21:51:14 +0000 (13:51 -0800)]
Merge "Fix single frame flicker when AllApps did its pre-load WAR that forced the driver to render one frame."
Jason Sams [Fri, 26 Feb 2010 21:50:31 +0000 (13:50 -0800)]
Fix single frame flicker when AllApps did its pre-load WAR that forced the driver to render one frame.
Dianne Hackborn [Thu, 25 Feb 2010 04:01:46 +0000 (20:01 -0800)]
Update to reflect android-common no longer in framework.
Romain Guy [Wed, 24 Feb 2010 18:04:17 +0000 (10:04 -0800)]
Correctly position the quick contact badge when opened from a folder.
Bug #
2467438
Bjorn Bringert [Tue, 23 Feb 2010 13:47:41 +0000 (13:47 +0000)]
Remove android.app.default_searchable=* from Launcher2
This value was deprecated in
I0252952b44ae85dab31221b598ed79cc24e2b580
Change-Id: If5639f2b51dd694f39e89f38e034e3d8efdba585
Jason Sams [Mon, 22 Feb 2010 23:41:30 +0000 (15:41 -0800)]
tweak alignment of all apps to avoid filtering artifacts.
Joe Onorato [Mon, 22 Feb 2010 23:07:16 +0000 (15:07 -0800)]
am
96ef9f68: am
bf5350db: fix
2460740 com.android.launcher2: java.lang.NullPointerException at com.android.launcher2.AllAppsView.saveAppsList(AllAppsView.java:1270)
Merge commit '
96ef9f68a43604c99cd18537a6c8e9d1c5049c31'
* commit '
96ef9f68a43604c99cd18537a6c8e9d1c5049c31':
fix
2460740 com.android.launcher2: java.lang.NullPointerException at
Joe Onorato [Mon, 22 Feb 2010 22:52:03 +0000 (14:52 -0800)]
am
bf5350db: fix
2460740 com.android.launcher2: java.lang.NullPointerException at com.android.launcher2.AllAppsView.saveAppsList(AllAppsView.java:1270)
Merge commit '
bf5350db6166df369a4e22012bc0a7a122f39a51' into eclair-plus-aosp
* commit '
bf5350db6166df369a4e22012bc0a7a122f39a51':
fix
2460740 com.android.launcher2: java.lang.NullPointerException at
Joe Onorato [Mon, 22 Feb 2010 22:46:10 +0000 (14:46 -0800)]
fix
2460740 com.android.launcher2: java.lang.NullPointerException at
com.android.launcher2.AllAppsView$RolloRS.saveAppsList(AllAppsView.java:1270)
Ying Wang [Sat, 20 Feb 2010 02:50:32 +0000 (18:50 -0800)]
Fix Proguard flags.
Joe Onorato [Fri, 19 Feb 2010 22:59:39 +0000 (14:59 -0800)]
minor refactor: This function is only called from one place. It doesn't need the parameters.
Joe Onorato [Fri, 19 Feb 2010 21:42:24 +0000 (13:42 -0800)]
am
869228da: am
3c24aca5: Don\'t crash when adding a shortcut.
Merge commit '
869228dadb0e537ce9138dc613c4cbc7e1aed1d3'
* commit '
869228dadb0e537ce9138dc613c4cbc7e1aed1d3':
Don't crash when adding a shortcut.
Joe Onorato [Fri, 19 Feb 2010 21:39:12 +0000 (13:39 -0800)]
am
3c24aca5: Don\'t crash when adding a shortcut.
Merge commit '
3c24aca5f597f2eb90e53dce450197e2f46c2305' into eclair-plus-aosp
* commit '
3c24aca5f597f2eb90e53dce450197e2f46c2305':
Don't crash when adding a shortcut.
Joe Onorato [Fri, 19 Feb 2010 21:10:40 +0000 (13:10 -0800)]
Don't crash when adding a shortcut.
Steps to reproduce: Menu > Add > Shortcut > Application > [any app]
E/AndroidRuntime( 1734): Caused by: java.lang.ClassCastException: com.android.launcher2.ShortcutInfo
E/AndroidRuntime( 1734): at com.android.launcher2.Workspace.onDropExternal(Workspace.java:963)
E/AndroidRuntime( 1734): at
com.android.launcher2.Workspace.addApplicationShortcut(Workspace.java:903)
E/AndroidRuntime( 1734): at
com.android.launcher2.Launcher.completeAddApplication(Launcher.java:669)
E/AndroidRuntime( 1734): at com.android.launcher2.Launcher.onActivityResult(Launcher.java:371)
E/AndroidRuntime( 1734): at android.app.Activity.dispatchActivityResult(Activity.java:3877)
E/AndroidRuntime( 1734): at android.app.ActivityThread.deliverResults(ActivityThread.java:3340)
Joe Onorato [Fri, 19 Feb 2010 21:10:40 +0000 (13:10 -0800)]
Don't crash when adding a shortcut.
Steps to reproduce: Menu > Add > Shortcut > Application > [any app]
E/AndroidRuntime( 1734): Caused by: java.lang.ClassCastException: com.android.launcher2.ShortcutInfo
E/AndroidRuntime( 1734): at com.android.launcher2.Workspace.onDropExternal(Workspace.java:963)
E/AndroidRuntime( 1734): at
com.android.launcher2.Workspace.addApplicationShortcut(Workspace.java:903)
E/AndroidRuntime( 1734): at
com.android.launcher2.Launcher.completeAddApplication(Launcher.java:669)
E/AndroidRuntime( 1734): at com.android.launcher2.Launcher.onActivityResult(Launcher.java:371)
E/AndroidRuntime( 1734): at android.app.Activity.dispatchActivityResult(Activity.java:3877)
E/AndroidRuntime( 1734): at android.app.ActivityThread.deliverResults(ActivityThread.java:3340)
Joe Onorato [Fri, 19 Feb 2010 20:51:37 +0000 (12:51 -0800)]
Merge "fix
2453680 - acore NPE on startup: setWallpaperPosition"
Joe Onorato [Fri, 19 Feb 2010 20:47:40 +0000 (12:47 -0800)]
fix
2453680 - acore NPE on startup: setWallpaperPosition
Wink Saville [Fri, 19 Feb 2010 17:32:40 +0000 (09:32 -0800)]
am
4baee90d: (-s ours) am
75dc3a9d: DO NOT MERGE; Add back support for uts testing.
Merge commit '
4baee90d22f02b1f31dcc7bca3bb9ad7263539ad'
* commit '
4baee90d22f02b1f31dcc7bca3bb9ad7263539ad':
DO NOT MERGE; Add back support for uts testing.
Wink Saville [Fri, 19 Feb 2010 17:24:48 +0000 (09:24 -0800)]
am
75dc3a9d: 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.
Wink Saville [Fri, 19 Feb 2010 17:05:23 +0000 (09:05 -0800)]
DO NOT MERGE; Add back support for uts testing.
Bjorn Bringert [Fri, 19 Feb 2010 11:15:40 +0000 (11:15 +0000)]
Fix silent DB upgrade abort
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
Eric Fischer [Fri, 19 Feb 2010 01:34:23 +0000 (17:34 -0800)]
am
6c6595ff: (-s ours) am
5d12096c: Reimport Launcher2 translations. DO NOT MERGE
Merge commit '
6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f'
* commit '
6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f':
Reimport Launcher2 translations. DO NOT MERGE
Eric Fischer [Fri, 19 Feb 2010 01:31:00 +0000 (17:31 -0800)]
am
5d12096c: Reimport Launcher2 translations. DO NOT MERGE
Merge commit '
5d12096cd22a875d7e1652cd4f6efdcad63689a7' into eclair-plus-aosp
* commit '
5d12096cd22a875d7e1652cd4f6efdcad63689a7':
Reimport Launcher2 translations. DO NOT MERGE
Eric Fischer [Fri, 19 Feb 2010 01:21:35 +0000 (17:21 -0800)]
Reimport Launcher2 translations. DO NOT MERGE
Joe Onorato [Fri, 19 Feb 2010 01:20:20 +0000 (17:20 -0800)]
am
5dec4c5a: (-s ours) am
75fd1ec4: DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can\'t be merged back.
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.
Joe Onorato [Fri, 19 Feb 2010 01:15:04 +0000 (17:15 -0800)]
am
75fd1ec4: 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.
Joe Onorato [Thu, 18 Feb 2010 23:31:52 +0000 (15:31 -0800)]
DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can't be merged back.
Joe Onorato [Thu, 18 Feb 2010 15:34:24 +0000 (10:34 -0500)]
Fix a crash on launcher db upgrade.
Romain Guy [Wed, 17 Feb 2010 23:24:26 +0000 (15:24 -0800)]
Merge "Correctly recenter the wallpaper when going back to default screen."
Romain Guy [Wed, 17 Feb 2010 23:22:58 +0000 (00:22 +0100)]
Correctly recenter the wallpaper when going back to default screen.
Joe Onorato [Wed, 17 Feb 2010 19:07:31 +0000 (14:07 -0500)]
fix
2411389 - calling RS with no Context
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...
Joe Onorato [Tue, 16 Feb 2010 23:25:23 +0000 (18:25 -0500)]
Don't do the haptic feedback on workspace items when they're not being picked up.
related to bug
2309687
Joe Onorato [Tue, 16 Feb 2010 20:55:38 +0000 (15:55 -0500)]
Fix
2446779 Launcher2 crash - while adding short cut to home from all apps drawer
Joe Onorato [Sat, 13 Feb 2010 16:23:10 +0000 (11:23 -0500)]
Revert "Merge "Launcher changes to handle UTS test mode." into eclair"
This reverts commit
b8fc9e7df69db4b1647ef780f5620836c86f70ea, reversing
changes made to
52ba5b08f25e031a6f717551c75abf630b92ed8b.
Jeff Hamilton [Sat, 13 Feb 2010 06:08:17 +0000 (00:08 -0600)]
Fix some broken SQL that causes a crash at boot.
Change-Id: I74e7f95b87eb427ad2c44d4197111ed18630e042
Wink Saville [Sat, 13 Feb 2010 00:02:32 +0000 (16:02 -0800)]
am
c4470606: am
b8fc9e7d: Merge "Launcher changes to handle UTS test mode." into eclair
Merge commit '
c44706064341f02a14d61091492a5fc6dc6efd2d'
* commit '
c44706064341f02a14d61091492a5fc6dc6efd2d':
Launcher changes to handle UTS test mode.
Wink Saville [Fri, 12 Feb 2010 23:57:30 +0000 (15:57 -0800)]
am
b8fc9e7d: Merge "Launcher changes to handle UTS test mode." into eclair
Merge commit '
b8fc9e7df69db4b1647ef780f5620836c86f70ea' into eclair-plus-aosp
* commit '
b8fc9e7df69db4b1647ef780f5620836c86f70ea':
Launcher changes to handle UTS test mode.
Wink Saville [Fri, 12 Feb 2010 23:51:46 +0000 (15:51 -0800)]
Merge "Launcher changes to handle UTS test mode." into eclair
Joe Onorato [Fri, 12 Feb 2010 22:55:25 +0000 (14:55 -0800)]
Merge "Don't make label textures if we don't need them."
Joe Onorato [Fri, 12 Feb 2010 22:53:35 +0000 (17:53 -0500)]
Don't make label textures if we don't need them.
Romain Guy [Fri, 12 Feb 2010 22:20:25 +0000 (23:20 +0100)]
Make sure the generated texture is 120px wide.
Joe Onorato [Fri, 12 Feb 2010 21:08:11 +0000 (13:08 -0800)]
Merge "Split ApplicationInfo into ApplicationInfo which is used for AllAppsView and ShortcutInfo which is used for the workspace."