diff options
| author | Michael Jurka <mikejurka@google.com> | 2010-11-23 16:23:58 -0800 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2010-12-08 14:52:41 -0800 |
| commit | af91de06b99e2d5d41ce79fefa34ce2111e51917 (patch) | |
| tree | d3a3d749bde953ae46563fe1621e9f0d9fe3b0e9 /src/com/android/launcher2/Launcher.java | |
| parent | f32e5e842ed49826bf188e54e400880f36e4d601 (diff) | |
| download | android_packages_apps_Trebuchet-af91de06b99e2d5d41ce79fefa34ce2111e51917.tar.gz android_packages_apps_Trebuchet-af91de06b99e2d5d41ce79fefa34ce2111e51917.tar.bz2 android_packages_apps_Trebuchet-af91de06b99e2d5d41ce79fefa34ce2111e51917.zip | |
code cleanup, preparing for spring-loaded adding to screens
Change-Id: Ic52b8df2b4c4998272fbfe2b1b195c177cac9a23
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index bbb59672d..d5f20c548 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -17,13 +17,9 @@ package com.android.launcher2; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import com.android.common.Search; +import com.android.launcher.R; +import com.android.launcher2.Workspace.ShrinkState; import android.animation.Animator; import android.animation.AnimatorSet; @@ -59,7 +55,6 @@ import android.content.res.TypedArray; import android.database.ContentObserver; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; @@ -104,8 +99,13 @@ import android.widget.Toast; import android.widget.TabHost.OnTabChangeListener; import android.widget.TabHost.TabContentFactory; -import com.android.common.Search; -import com.android.launcher.R; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; /** @@ -2621,9 +2621,9 @@ public final class Launcher extends Activity setPivotsForZoom(toView, toState, scale); if (toAllApps) { - mWorkspace.shrinkToBottomHidden(animated); + mWorkspace.shrink(ShrinkState.BOTTOM_HIDDEN, animated); } else { - mWorkspace.shrinkToTop(animated); + mWorkspace.shrink(ShrinkState.TOP, animated); } if (animated) { @@ -2760,9 +2760,9 @@ public final class Launcher extends Activity mAllAppsPagedView.endChoiceMode(); if (toState == State.ALL_APPS) { - mWorkspace.shrinkToBottomHidden(animated); + mWorkspace.shrink(Workspace.ShrinkState.BOTTOM_HIDDEN, animated); } else { - mWorkspace.shrinkToTop(animated); + mWorkspace.shrink(Workspace.ShrinkState.TOP, animated); } if (animated) { |