summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix Proguard flags.Ying Wang2010-02-191-0/+2
| |
* | am 2347b233: am 4700fed7: Maybe this will silence http://b/2460740Joe Onorato2010-03-011-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '2347b2335b26edc5b7145759cc8a727fc712b970' * commit '2347b2335b26edc5b7145759cc8a727fc712b970': Maybe this will silence http://b/2460740
| * \ am 4700fed7: Maybe this will silence http://b/2460740Joe Onorato2010-03-011-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4700fed72b619a09a0d9cac93e86625b95c730dc' into eclair-plus-aosp * commit '4700fed72b619a09a0d9cac93e86625b95c730dc': Maybe this will silence http://b/2460740
| | * | Maybe this will silence http://b/2460740Joe Onorato2010-03-011-1/+2
| | | |
* | | | Fix folders asset.Romain Guy2010-03-011-0/+0
| | | | | | | | | | | | | | | | Bug #2478416
* | | | Import new translations.Eric Fischer2010-02-265-13/+11
| | | |
* | | | Merge "Fix single frame flicker when AllApps did its pre-load WAR that ↵Jason Sams2010-02-261-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | forced the driver to render one frame."
| * | | | Fix single frame flicker when AllApps did its pre-load WAR that forced the ↵Jason Sams2010-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | driver to render one frame.
* | | | | Update to reflect android-common no longer in framework.Dianne Hackborn2010-02-241-1/+2
| | | | |
* | | | | Correctly position the quick contact badge when opened from a folder.Romain Guy2010-02-242-11/+8
| | | | | | | | | | | | | | | | | | | | Bug #2467438
* | | | | Remove android.app.default_searchable=* from Launcher2Bjorn Bringert2010-02-231-5/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This value was deprecated in I0252952b44ae85dab31221b598ed79cc24e2b580 Change-Id: If5639f2b51dd694f39e89f38e034e3d8efdba585
* | | | tweak alignment of all apps to avoid filtering artifacts.Jason Sams2010-02-221-3/+3
| | | |
* | | | am 96ef9f68: am bf5350db: fix 2460740 com.android.launcher2: ↵Joe Onorato2010-02-221-12/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | am bf5350db: fix 2460740 com.android.launcher2: ↵Joe Onorato2010-02-221-12/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | fix 2460740 com.android.launcher2: java.lang.NullPointerException atJoe Onorato2010-02-221-12/+11
| | | | | | | | | | | | | | | | com.android.launcher2.AllAppsView$RolloRS.saveAppsList(AllAppsView.java:1270)
* | | | minor refactor: This function is only called from one place. It doesn't ↵Joe Onorato2010-02-191-8/+8
| | | | | | | | | | | | | | | | need the parameters.
* | | | am 869228da: am 3c24aca5: Don\'t crash when adding a shortcut.Joe Onorato2010-02-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3' * commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3': Don't crash when adding a shortcut.
| * | | am 3c24aca5: Don\'t crash when adding a shortcut.Joe Onorato2010-02-191-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3c24aca5f597f2eb90e53dce450197e2f46c2305' into eclair-plus-aosp * commit '3c24aca5f597f2eb90e53dce450197e2f46c2305': Don't crash when adding a shortcut.
| | * | Don't crash when adding a shortcut.Joe Onorato2010-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | Don't crash when adding a shortcut.Joe Onorato2010-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | Merge "fix 2453680 - acore NPE on startup: setWallpaperPosition"Joe Onorato2010-02-191-2/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix 2453680 - acore NPE on startup: setWallpaperPositionJoe Onorato2010-02-191-2/+7
| | | |
* | | | am 4baee90d: (-s ours) am 75dc3a9d: DO NOT MERGE; Add back support for uts ↵Wink Saville2010-02-190-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | testing. Merge commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad' * commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad': DO NOT MERGE; Add back support for uts testing.
| * | am 75dc3a9d: DO NOT MERGE; Add back support for uts testing.Wink Saville2010-02-191-0/+55
| |\| | | | | | | | | | | | | | | | | | | Merge commit '75dc3a9d28a184358127390329b36a5a520c212c' into eclair-plus-aosp * commit '75dc3a9d28a184358127390329b36a5a520c212c': DO NOT MERGE; Add back support for uts testing.
| | * DO NOT MERGE; Add back support for uts testing.Wink Saville2010-02-191-0/+55
| | |
* | | Fix silent DB upgrade abortBjorn Bringert2010-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 6c6595ff: (-s ours) am 5d12096c: Reimport Launcher2 translations. DO NOT ↵Eric Fischer2010-02-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | MERGE Merge commit '6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f' * commit '6c6595ffbf7ab8a3e503bc73dd7f36621b03b04f': Reimport Launcher2 translations. DO NOT MERGE
| * | am 5d12096c: Reimport Launcher2 translations. DO NOT MERGEEric Fischer2010-02-182-1/+2
| |\| | | | | | | | | | | | | | | | | | | Merge commit '5d12096cd22a875d7e1652cd4f6efdcad63689a7' into eclair-plus-aosp * commit '5d12096cd22a875d7e1652cd4f6efdcad63689a7': Reimport Launcher2 translations. DO NOT MERGE
| | * Reimport Launcher2 translations. DO NOT MERGEEric Fischer2010-02-182-1/+2
| | |
* | | am 5dec4c5a: (-s ours) am 75fd1ec4: DO NOT MERGE - Use the froyo launcher2 ↵Joe Onorato2010-02-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | am 75fd1ec4: DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few ↵Joe Onorato2010-02-1843-2660/+1308
| |\| | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling ↵Joe Onorato2010-02-1843-2660/+1308
| | | | | | | | | | | | things that can't be merged back.
* | | Fix a crash on launcher db upgrade.Joe Onorato2010-02-181-0/+1
| | |
* | | Merge "Correctly recenter the wallpaper when going back to default screen."Romain Guy2010-02-171-1/+2
|\ \ \
| * | | Correctly recenter the wallpaper when going back to default screen.Romain Guy2010-02-181-1/+2
| | | |
* | | | fix 2411389 - calling RS with no ContextJoe Onorato2010-02-171-1/+17
| | | | | | | | | | | | | | | | | | | | 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...
* | | | Don't do the haptic feedback on workspace items when they're not being ↵Joe Onorato2010-02-163-0/+5
|/ / / | | | | | | | | | | | | | | | picked up. related to bug 2309687
* | | Fix 2446779 Launcher2 crash - while adding short cut to home from all apps ↵Joe Onorato2010-02-161-1/+1
| | | | | | | | | | | | drawer
* | | Revert "Merge "Launcher changes to handle UTS test mode." into eclair"Joe Onorato2010-02-131-56/+0
| | | | | | | | | | | | | | | This reverts commit b8fc9e7df69db4b1647ef780f5620836c86f70ea, reversing changes made to 52ba5b08f25e031a6f717551c75abf630b92ed8b.
* | | Fix some broken SQL that causes a crash at boot.Jeff Hamilton2010-02-131-1/+1
| | | | | | | | | | | | Change-Id: I74e7f95b87eb427ad2c44d4197111ed18630e042
* | | am c4470606: am b8fc9e7d: Merge "Launcher changes to handle UTS test mode." ↵Wink Saville2010-02-121-0/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit 'c44706064341f02a14d61091492a5fc6dc6efd2d' * commit 'c44706064341f02a14d61091492a5fc6dc6efd2d': Launcher changes to handle UTS test mode.
| * | am b8fc9e7d: Merge "Launcher changes to handle UTS test mode." into eclairWink Saville2010-02-121-0/+56
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'b8fc9e7df69db4b1647ef780f5620836c86f70ea' into eclair-plus-aosp * commit 'b8fc9e7df69db4b1647ef780f5620836c86f70ea': Launcher changes to handle UTS test mode.
| | * Merge "Launcher changes to handle UTS test mode." into eclairWink Saville2010-02-121-0/+56
| | |\
| | | * Launcher changes to handle UTS test mode.Wink Saville2010-02-121-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Don't make label textures if we don't need them."Joe Onorato2010-02-121-3/+5
|\ \ \ \
| * | | | Don't make label textures if we don't need them.Joe Onorato2010-02-121-3/+5
| | | | |
* | | | | Make sure the generated texture is 120px wide.Romain Guy2010-02-121-1/+1
| | | | |
* | | | | Merge "Split ApplicationInfo into ApplicationInfo which is used for ↵Joe Onorato2010-02-1225-609/+632
|\| | | | | | | | | | | | | | | | | | | AllAppsView and ShortcutInfo which is used for the workspace."
| * | | | Split ApplicationInfo into ApplicationInfo which is used for AllAppsView and ↵Joe Onorato2010-02-1225-609/+632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ShortcutInfo which is 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.
* | | | | am f80592cc: (-s ours) am 52ba5b08: DO NOT MERGE. Update for new RS library ↵Jason Sams2010-02-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with ES 2.0 support. Merge commit 'f80592cc642828c5c1e4638f5d495d186c4b3e6c' * commit 'f80592cc642828c5c1e4638f5d495d186c4b3e6c': DO NOT MERGE. Update for new RS library with ES 2.0 support.