Implement landscape in 3D all apps.

Bug #2454737
Bug #2454736

3 files changed, 308 insertions, 342 deletions

diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index acf75e139..59bda67c4 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -23,9 +23,7 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
-import android.os.SystemClock;
 import android.renderscript.Allocation;
-import android.renderscript.Dimension;
 import android.renderscript.Element;
 import android.renderscript.ProgramFragment;
 import android.renderscript.ProgramStore;
@@ -39,6 +37,7 @@ import android.renderscript.ScriptC;
 import android.renderscript.SimpleMesh;
 import android.renderscript.Type;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -52,8 +51,6 @@ import android.view.accessibility.AccessibilityEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
-
 
 public class AllApps3D extends RSSurfaceView
         implements AllAppsView, View.OnClickListener, View.OnLongClickListener, DragSource {
@@ -100,21 +97,21 @@ public class AllApps3D extends RSSurfaceView
      * One of the SELECTION_ constants.
      */
     private int mLastSelection;
-
+    
     /**
      * Used to keep track of the selection when AllAppsView loses window focus
      */
     private int mLastSelectedIcon;
-
+    
     private VelocityTracker mVelocityTracker;
     private int mTouchTracking;
     private int mMotionDownRawX;
     private int mMotionDownRawY;
     private int mDownIconIndex = -1;
     private int mCurrentIconIndex = -1;
-
+    
     private boolean mShouldGainFocus;
-
+    
     private boolean mHaveSurface = false;
     private boolean mZoomDirty = false;
     private boolean mAnimateNextZoom;
@@ -123,26 +120,33 @@ public class AllApps3D extends RSSurfaceView
     private float mPosX;
     private float mVelocity;
     private AAMessage mMessageProc;
-
+    
+    private int mColumnsPerPage;
+    private int mRowsPerPage;
+    
+    @SuppressWarnings({"UnusedDeclaration"})
     static class Defines {
         public static final int ALLOC_PARAMS = 0;
         public static final int ALLOC_STATE = 1;
         public static final int ALLOC_ICON_IDS = 3;
         public static final int ALLOC_LABEL_IDS = 4;
         public static final int ALLOC_VP_CONSTANTS = 5;
-
-        public static final int COLUMNS_PER_PAGE = 4;
-        public static final int ROWS_PER_PAGE = 4;
-
+    
+        public static final int COLUMNS_PER_PAGE_PORTRAIT = 4;
+        public static final int ROWS_PER_PAGE_PORTRAIT = 4;
+    
+        public static final int COLUMNS_PER_PAGE_LANDSCAPE = 6;
+        public static final int ROWS_PER_PAGE_LANDSCAPE = 3;
+        
         public static final int ICON_WIDTH_PX = 64;
         public static final int ICON_TEXTURE_WIDTH_PX = 74;
         public static final int SELECTION_TEXTURE_WIDTH_PX = 74 + 20;
-
+    
         public static final int ICON_HEIGHT_PX = 64;
         public static final int ICON_TEXTURE_HEIGHT_PX = 74;
         public static final int SELECTION_TEXTURE_HEIGHT_PX = 74 + 20;
     }
-
+    
     public AllApps3D(Context context, AttributeSet attrs) {
         super(context, attrs);
         setFocusable(true);
@@ -151,15 +155,27 @@ public class AllApps3D extends RSSurfaceView
         final ViewConfiguration config = ViewConfiguration.get(context);
         mSlop = config.getScaledTouchSlop();
         mMaxFlingVelocity = config.getScaledMaximumFlingVelocity();
-
+    
         setOnClickListener(this);
         setOnLongClickListener(this);
         setZOrderOnTop(true);
         getHolder().setFormat(PixelFormat.TRANSLUCENT);
-
+    
         mRS = createRenderScript(true);
+    
+        final DisplayMetrics metrics = getResources().getDisplayMetrics();
+        final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
+        mColumnsPerPage = isPortrait ? Defines.COLUMNS_PER_PAGE_PORTRAIT :
+                Defines.COLUMNS_PER_PAGE_LANDSCAPE;
+        mRowsPerPage = isPortrait ? Defines.ROWS_PER_PAGE_PORTRAIT :
+                Defines.ROWS_PER_PAGE_LANDSCAPE;
     }
-
+    
+    @SuppressWarnings({"UnusedDeclaration"})
+    public AllApps3D(Context context, AttributeSet attrs, int defStyle) {
+        this(context, attrs);
+    }
+    
     /**
      * Note that this implementation prohibits this view from ever being reattached.
      */
@@ -169,7 +185,7 @@ public class AllApps3D extends RSSurfaceView
         mRS.mMessageCallback = null;
         mRS = null;
     }
-
+    
     /**
      * If you have an attached click listener, View always plays the click sound!?!?
      * Deal with sound effects by hand.
@@ -180,15 +196,11 @@ public class AllApps3D extends RSSurfaceView
         playSoundEffect(sound);
         setSoundEffectsEnabled(old);
     }
-
-    public AllApps3D(Context context, AttributeSet attrs, int defStyle) {
-        this(context, attrs);
-    }
-
+    
     public void setLauncher(Launcher launcher) {
         mLauncher = launcher;
     }
-
+    
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
         super.surfaceDestroyed(holder);
@@ -199,15 +211,15 @@ public class AllApps3D extends RSSurfaceView
         mZoomDirty = true;
         mHaveSurface = false;
     }
-
+    
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
         //long startTime = SystemClock.uptimeMillis();
-
+    
         super.surfaceChanged(holder, format, w, h);
-
+    
         mHaveSurface = true;
-
+    
         if (mRollo == null) {
             mRollo = new RolloRS();
             mRollo.init(getResources(), w, h);
@@ -221,15 +233,11 @@ public class AllApps3D extends RSSurfaceView
         }
         mRollo.dirtyCheck();
         mRollo.resize(w, h);
-
+    
         if (mRS != null) {
             mRS.mMessageCallback = mMessageProc = new AAMessage();
         }
-
-        Resources res = getContext().getResources();
-        int barHeight = (int)res.getDimension(R.dimen.button_bar_height);
-
-
+    
         if (mRollo.mUniformAlloc != null) {
             float tf[] = new float[] {72.f, 72.f,
                                       120.f, 120.f, 0.f, 0.f,
@@ -242,14 +250,14 @@ public class AllApps3D extends RSSurfaceView
                 tf[10] = -((float)w / 2) - 0.25f;
                 tf[11] = -((float)h / 2) - 0.25f;
             }
-
+    
             mRollo.mUniformAlloc.data(tf);
         }
-
+    
         //long endTime = SystemClock.uptimeMillis();
         //Log.d(TAG, "surfaceChanged took " + (endTime-startTime) + "ms");
     }
-
+    
     @Override
     public void onWindowFocusChanged(boolean hasWindowFocus) {
         super.onWindowFocusChanged(hasWindowFocus);
@@ -260,20 +268,20 @@ public class AllApps3D extends RSSurfaceView
                 mRollo.setHomeSelected(SELECTED_NONE);
                 mRollo.clearSelectedIcon();
                 mRollo.mState.save();
-            } else if (hasWindowFocus) {
+            } else {
                 if (mRollo.mState.iconCount > 0) {
                     if (mLastSelection == SELECTION_ICONS) {
                         int selection = mLastSelectedIcon;
                         final int firstIcon = Math.round(mPosX) *
-                            Defines.COLUMNS_PER_PAGE;
+                                mColumnsPerPage;
                         if (selection < 0 || // No selection
                                 selection < firstIcon || // off the top of the screen
                                 selection >= mRollo.mState.iconCount || // past last icon
                                 selection >= firstIcon + // past last icon on screen
-                                    (Defines.COLUMNS_PER_PAGE * Defines.ROWS_PER_PAGE)) {
+                                    (mColumnsPerPage * mRowsPerPage)) {
                             selection = firstIcon;
                         }
-
+    
                         // Select the first icon when we gain window focus
                         mRollo.selectIcon(selection, SELECTED_FOCUSED);
                         mRollo.mState.save();
@@ -285,15 +293,15 @@ public class AllApps3D extends RSSurfaceView
             }
         }
     }
-
+    
     @Override
     protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-
+    
         if (!isVisible()) {
             return;
         }
-
+    
         if (gainFocus) {
             if (mRollo != null) {
                 gainFocus();
@@ -314,27 +322,27 @@ public class AllApps3D extends RSSurfaceView
             }
         }
     }
-
+    
     private void gainFocus() {
         if (!mArrowNavigation && mRollo.mState.iconCount > 0) {
             // Select the first icon when we gain keyboard focus
             mArrowNavigation = true;
-            mRollo.selectIcon(Math.round(mPosX) * Defines.COLUMNS_PER_PAGE,
+            mRollo.selectIcon(Math.round(mPosX) * mColumnsPerPage,
                     SELECTED_FOCUSED);
             mRollo.mState.save();
         }
     }
-
+    
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-
+    
         boolean handled = false;
-
+    
         if (!isVisible()) {
             return false;
         }
         final int iconCount = mRollo.mState.iconCount;
-
+    
         if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) {
             if (mArrowNavigation) {
                 if (mLastSelection == SELECTION_HOME) {
@@ -350,36 +358,36 @@ public class AllApps3D extends RSSurfaceView
                 }
             }
         }
-
+    
         if (iconCount > 0) {
             mArrowNavigation = true;
-
+    
             int currentSelection = mRollo.mState.selectedIconIndex;
             int currentTopRow = Math.round(mPosX);
-
-            // The column of the current selection, in the range 0..COLUMNS_PER_PAGE-1
-            final int currentPageCol = currentSelection % Defines.COLUMNS_PER_PAGE;
-
-            // The row of the current selection, in the range 0..ROWS_PER_PAGE-1
-            final int currentPageRow = (currentSelection - (currentTopRow*Defines.COLUMNS_PER_PAGE))
-                    / Defines.ROWS_PER_PAGE;
-
+    
+            // The column of the current selection, in the range 0..COLUMNS_PER_PAGE_PORTRAIT-1
+            final int currentPageCol = currentSelection % mColumnsPerPage;
+    
+            // The row of the current selection, in the range 0..ROWS_PER_PAGE_PORTRAIT-1
+            final int currentPageRow = (currentSelection - (currentTopRow* mColumnsPerPage))
+                    / mRowsPerPage;
+    
             int newSelection = currentSelection;
-
+    
             switch (keyCode) {
             case KeyEvent.KEYCODE_DPAD_UP:
                 if (mLastSelection == SELECTION_HOME) {
                     mRollo.setHomeSelected(SELECTED_NONE);
-                    int lastRowCount = iconCount % Defines.COLUMNS_PER_PAGE;
+                    int lastRowCount = iconCount % mColumnsPerPage;
                     if (lastRowCount == 0) {
-                        lastRowCount = Defines.COLUMNS_PER_PAGE;
+                        lastRowCount = mColumnsPerPage;
                     }
-                    newSelection = iconCount - lastRowCount + (Defines.COLUMNS_PER_PAGE / 2);
+                    newSelection = iconCount - lastRowCount + (mColumnsPerPage / 2);
                     if (newSelection >= iconCount) {
                         newSelection = iconCount-1;
                     }
-                    int target = (newSelection / Defines.COLUMNS_PER_PAGE)
-                            - (Defines.ROWS_PER_PAGE - 1);
+                    int target = (newSelection / mColumnsPerPage)
+                            - (mRowsPerPage - 1);
                     if (target < 0) {
                         target = 0;
                     }
@@ -388,28 +396,28 @@ public class AllApps3D extends RSSurfaceView
                     }
                 } else {
                     if (currentPageRow > 0) {
-                        newSelection = currentSelection - Defines.COLUMNS_PER_PAGE;
+                        newSelection = currentSelection - mColumnsPerPage;
                     } else if (currentTopRow > 0) {
-                        newSelection = currentSelection - Defines.COLUMNS_PER_PAGE;
-                        mRollo.moveTo(newSelection / Defines.COLUMNS_PER_PAGE);
+                        newSelection = currentSelection - mColumnsPerPage;
+                        mRollo.moveTo(newSelection / mColumnsPerPage);
                     } else if (currentPageRow != 0) {
-                        newSelection = currentTopRow * Defines.ROWS_PER_PAGE;
+                        newSelection = currentTopRow * mRowsPerPage;
                     }
                 }
                 handled = true;
                 break;
-
+    
             case KeyEvent.KEYCODE_DPAD_DOWN: {
-                final int rowCount = iconCount / Defines.COLUMNS_PER_PAGE
-                        + (iconCount % Defines.COLUMNS_PER_PAGE == 0 ? 0 : 1);
-                final int currentRow = currentSelection / Defines.COLUMNS_PER_PAGE;
+                final int rowCount = iconCount / mColumnsPerPage
+                        + (iconCount % mColumnsPerPage == 0 ? 0 : 1);
+                final int currentRow = currentSelection / mColumnsPerPage;
                 if (mLastSelection != SELECTION_HOME) {
                     if (currentRow < rowCount-1) {
                         mRollo.setHomeSelected(SELECTED_NONE);
                         if (currentSelection < 0) {
                             newSelection = 0;
                         } else {
-                            newSelection = currentSelection + Defines.COLUMNS_PER_PAGE;
+                            newSelection = currentSelection + mColumnsPerPage;
                         }
                         if (newSelection >= iconCount) {
                             // Go from D to G in this arrangement:
@@ -417,9 +425,9 @@ public class AllApps3D extends RSSurfaceView
                             //     E F G
                             newSelection = iconCount - 1;
                         }
-                        if (currentPageRow >= Defines.ROWS_PER_PAGE - 1) {
-                            mRollo.moveTo((newSelection / Defines.COLUMNS_PER_PAGE) -
-                                    Defines.ROWS_PER_PAGE + 1);
+                        if (currentPageRow >= mRowsPerPage - 1) {
+                            mRollo.moveTo((newSelection / mColumnsPerPage) -
+                                    mRowsPerPage + 1);
                         }
                     } else {
                         newSelection = -1;
@@ -439,7 +447,7 @@ public class AllApps3D extends RSSurfaceView
                 break;
             case KeyEvent.KEYCODE_DPAD_RIGHT:
                 if (mLastSelection != SELECTION_HOME) {
-                    if ((currentPageCol < Defines.COLUMNS_PER_PAGE - 1) &&
+                    if ((currentPageCol < mColumnsPerPage - 1) &&
                             (currentSelection < iconCount - 1)) {
                         newSelection = currentSelection + 1;
                     }
@@ -454,25 +462,25 @@ public class AllApps3D extends RSSurfaceView
         }
         return handled;
     }
-
+    
     @Override
     public boolean onTouchEvent(MotionEvent ev)
     {
         mArrowNavigation = false;
-
+    
         if (!isVisible()) {
             return true;
         }
-
+    
         if (mLocks != 0) {
             return true;
         }
-
+    
         super.onTouchEvent(ev);
-
+    
         int x = (int)ev.getX();
         int y = (int)ev.getY();
-
+    
         int action = ev.getAction();
         switch (action) {
         case MotionEvent.ACTION_DOWN:
@@ -483,13 +491,13 @@ public class AllApps3D extends RSSurfaceView
                 mCurrentIconIndex = -1;
             } else {
                 mTouchTracking = TRACKING_FLING;
-
+    
                 mMotionDownRawX = (int)ev.getRawX();
                 mMotionDownRawY = (int)ev.getRawY();
-
+    
                 mRollo.mState.newPositionX = ev.getRawY() / getHeight();
                 mRollo.mState.newTouchDown = 1;
-
+    
                 if (!mRollo.checkClickOK()) {
                     mRollo.clearSelectedIcon();
                 } else {
@@ -514,11 +522,10 @@ public class AllApps3D extends RSSurfaceView
                         ? SELECTED_PRESSED : SELECTED_NONE);
                 mRollo.mState.save();
             } else if (mTouchTracking == TRACKING_FLING) {
-                int rawX = (int)ev.getRawX();
                 int rawY = (int)ev.getRawY();
                 int slop;
                 slop = Math.abs(rawY - mMotionDownRawY);
-
+    
                 if (!mStartedScrolling && slop < mSlop) {
                     // don't update anything so when we do start scrolling
                     // below, we get the right delta.
@@ -537,7 +544,7 @@ public class AllApps3D extends RSSurfaceView
                     mRollo.mState.newPositionX = ev.getRawY() / getHeight();
                     mRollo.mState.newTouchDown = 1;
                     mRollo.move();
-
+    
                     mStartedScrolling = true;
                     mRollo.clearSelectedIcon();
                     mVelocityTracker.addMovement(ev);
@@ -560,13 +567,13 @@ public class AllApps3D extends RSSurfaceView
             } else if (mTouchTracking == TRACKING_FLING) {
                 mRollo.mState.newTouchDown = 0;
                 mRollo.mState.newPositionX = ev.getRawY() / getHeight();
-
+    
                 mVelocityTracker.computeCurrentVelocity(1000 /* px/sec */, mMaxFlingVelocity);
                 mRollo.mState.flingVelocity = mVelocityTracker.getYVelocity() / getHeight();
                 mRollo.clearSelectedIcon();
                 mRollo.mState.save();
                 mRollo.fling();
-
+    
                 if (mVelocityTracker != null) {
                     mVelocityTracker.recycle();
                     mVelocityTracker = null;
@@ -575,10 +582,10 @@ public class AllApps3D extends RSSurfaceView
             mTouchTracking = TRACKING_NONE;
             break;
         }
-
+    
         return true;
     }
-
+    
     public void onClick(View v) {
         if (mLocks != 0 || !isVisible()) {
             return;
@@ -590,7 +597,7 @@ public class AllApps3D extends RSSurfaceView
             mLauncher.startActivitySafely(app.intent);
         }
     }
-
+    
     public boolean onLongClick(View v) {
         if (mLocks != 0 || !isVisible()) {
             return true;
@@ -598,25 +605,23 @@ public class AllApps3D extends RSSurfaceView
         if (mRollo.checkClickOK() && mCurrentIconIndex == mDownIconIndex
                 && mCurrentIconIndex >= 0 && mCurrentIconIndex < mAllAppsList.size()) {
             ApplicationInfo app = mAllAppsList.get(mCurrentIconIndex);
-
+    
             Bitmap bmp = app.iconBitmap;
             final int w = bmp.getWidth();
             final int h = bmp.getHeight();
-
+    
             // We don't really have an accurate location to use.  This will do.
             int screenX = mMotionDownRawX - (w / 2);
             int screenY = mMotionDownRawY - h;
-
-            int left = (mDefines.ICON_TEXTURE_WIDTH_PX - mDefines.ICON_WIDTH_PX) / 2;
-            int top = (mDefines.ICON_TEXTURE_HEIGHT_PX - mDefines.ICON_HEIGHT_PX) / 2;
+    
             mDragController.startDrag(bmp, screenX, screenY,
                     0, 0, w, h, this, app, DragController.DRAG_ACTION_COPY);
-
+    
             mLauncher.closeAllApps(true);
         }
         return true;
     }
-
+    
     @Override
     public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
         if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_SELECTED) {
@@ -653,14 +658,14 @@ public class AllApps3D extends RSSurfaceView
         }
         return false;
     }
-
+    
     public void setDragController(DragController dragger) {
         mDragController = dragger;
     }
-
+    
     public void onDropCompleted(View target, boolean success) {
     }
-
+    
     /**
      * Zoom to the specifed level.
      *
@@ -675,33 +680,32 @@ public class AllApps3D extends RSSurfaceView
         if (mRollo == null || !mHaveSurface) {
             mZoomDirty = true;
             mZoom = zoom;
-            return;
         } else {
             mRollo.setZoom(zoom, animate);
         }
     }
-
+    
     public boolean isVisible() {
         return mZoom > 0.001f;
     }
-
+    
     public boolean isOpaque() {
         return mZoom > 0.999f;
     }
-
+    
     public void setApps(ArrayList<ApplicationInfo> list) {
         if (mRS == null) {
             // We've been removed from the window.  Don't bother with all this.
             return;
         }
-
+    
         mAllAppsList = list;
         if (mRollo != null) {
             mRollo.setApps(list);
         }
         mLocks &= ~LOCK_ICONS_PENDING;
     }
-
+    
     public void addApps(ArrayList<ApplicationInfo> list) {
         if (mAllAppsList == null) {
             // Not done loading yet.  We'll find out about it later.
@@ -711,12 +715,12 @@ public class AllApps3D extends RSSurfaceView
             // We've been removed from the window.  Don't bother with all this.
             return;
         }
-
+    
         final int N = list.size();
         if (mRollo != null) {
             mRollo.reallocAppsList(mRollo.mState.iconCount + N);
         }
-
+    
         for (int i=0; i<N; i++) {
             final ApplicationInfo item = list.get(i);
             int index = Collections.binarySearch(mAllAppsList, item,
@@ -729,24 +733,23 @@ public class AllApps3D extends RSSurfaceView
                 mRollo.addApp(index, item);
             }
         }
-
+    
         if (mRollo != null) {
             mRollo.saveAppsList();
         }
     }
-
+    
     public void removeApps(ArrayList<ApplicationInfo> list) {
         if (mAllAppsList == null) {
             // Not done loading yet.  We'll find out about it later.
             return;
         }
-
+    
         final int N = list.size();
         for (int i=0; i<N; i++) {
             final ApplicationInfo item = list.get(i);
             int index = findAppByComponent(mAllAppsList, item);
             if (index >= 0) {
-                int ic = mRollo != null ? mRollo.mState.iconCount : 666;
                 mAllAppsList.remove(index);
                 if (mRollo != null) {
                     mRollo.removeApp(index);
@@ -756,18 +759,18 @@ public class AllApps3D extends RSSurfaceView
                 // Try to recover.  This should keep us from crashing for now.
             }
         }
-
+    
         if (mRollo != null) {
             mRollo.saveAppsList();
         }
     }
-
+    
     public void updateApps(String packageName, ArrayList<ApplicationInfo> list) {
         // Just remove and add, because they may need to be re-sorted.
         removeApps(list);
         addApps(list);
     }
-
+    
     private static int findAppByComponent(ArrayList<ApplicationInfo> list, ApplicationInfo item) {
         ComponentName component = item.intent.getComponent();
         final int N = list.size();
@@ -779,15 +782,17 @@ public class AllApps3D extends RSSurfaceView
         }
         return -1;
     }
-
+    
+    /*
     private static int countPages(int iconCount) {
-        int iconsPerPage = Defines.COLUMNS_PER_PAGE * Defines.ROWS_PER_PAGE;
+        int iconsPerPage = getColumnsCount() * Defines.ROWS_PER_PAGE_PORTRAIT;
         int pages = iconCount / iconsPerPage;
         if (pages*iconsPerPage != iconCount) {
             pages++;
         }
         return pages;
     }
+    */
 
     class AAMessage extends RenderScript.RSMessage {
         public void run() {
@@ -797,13 +802,13 @@ public class AllApps3D extends RSSurfaceView
             mZoomDirty = false;
         }
     }
-
+    
     public class RolloRS {
-
+    
         // Allocations ======
         private int mWidth;
         private int mHeight;
-
+    
         private Resources mRes;
         private Script mScript;
         private Script.Invokable mInvokeMove;
@@ -811,7 +816,7 @@ public class AllApps3D extends RSSurfaceView
         private Script.Invokable mInvokeFling;
         private Script.Invokable mInvokeResetWAR;
         private Script.Invokable mInvokeSetZoom;
-
+    
         private ProgramStore mPSIcons;
         private ProgramFragment mPFTexMip;
         private ProgramFragment mPFTexMipAlpha;
@@ -820,45 +825,45 @@ public class AllApps3D extends RSSurfaceView
         private ProgramVertex mPVCurve;
         private SimpleMesh mMesh;
         private ProgramVertex.MatrixAllocation mPVA;
-
+    
         private Allocation mUniformAlloc;
-
+    
         private Allocation mHomeButtonNormal;
         private Allocation mHomeButtonFocused;
         private Allocation mHomeButtonPressed;
-
+    
         private Allocation[] mIcons;
         private int[] mIconIds;
         private Allocation mAllocIconIds;
-
+    
         private Allocation[] mLabels;
         private int[] mLabelIds;
         private Allocation mAllocLabelIds;
         private Allocation mSelectedIcon;
-
+    
         private int[] mTouchYBorders;
         private int[] mTouchXBorders;
-
+    
         private Bitmap mSelectionBitmap;
         private Canvas mSelectionCanvas;
-
+    
         Params mParams;
         State mState;
-
+    
         class BaseAlloc {
             Allocation mAlloc;
             Type mType;
-
+    
             void save() {
                 mAlloc.data(this);
             }
         }
-
+    
         private boolean checkClickOK() {
             return (Math.abs(mVelocity) < 0.4f) &&
                    (Math.abs(mPosX - Math.round(mPosX)) < 0.4f);
         }
-
+    
         class Params extends BaseAlloc {
             Params() {
                 mType = Type.createFromClass(mRS, Params.class, 1, "ParamsClass");
@@ -869,13 +874,13 @@ public class AllApps3D extends RSSurfaceView
             public int bubbleHeight;
             public int bubbleBitmapWidth;
             public int bubbleBitmapHeight;
-
+    
             public int homeButtonWidth;
             public int homeButtonHeight;
             public int homeButtonTextureWidth;
             public int homeButtonTextureHeight;
         }
-
+    
         class State extends BaseAlloc {
             public float newPositionX;
             public int newTouchDown;
@@ -886,17 +891,17 @@ public class AllApps3D extends RSSurfaceView
             public float zoomTarget;
             public int homeButtonId;
             public float targetPos;
-
+    
             State() {
                 mType = Type.createFromClass(mRS, State.class, 1, "StateClass");
                 mAlloc = Allocation.createTyped(mRS, mType);
                 save();
             }
         }
-
+    
         public RolloRS() {
         }
-
+    
         public void init(Resources res, int width, int height) {
             mRes = res;
             mWidth = width;
@@ -909,10 +914,10 @@ public class AllApps3D extends RSSurfaceView
             initTouchState();
             initRs();
         }
-
+    
         public void initMesh() {
             SimpleMesh.TriangleMeshBuilder tm = new SimpleMesh.TriangleMeshBuilder(mRS, 2, 0);
-
+    
             for (int ct=0; ct < 16; ct++) {
                 float pos = (1.f / (16.f - 1)) * ct;
                 tm.addVertex(0.0f, pos);
@@ -925,90 +930,90 @@ public class AllApps3D extends RSSurfaceView
             mMesh = tm.create();
             mMesh.setName("SMCell");
         }
-
+    
         void resize(int w, int h) {
             mPVA.setupProjectionNormalized(w, h);
             mWidth = w;
             mHeight = h;
         }
-
+    
         private void initProgramVertex() {
             mPVA = new ProgramVertex.MatrixAllocation(mRS);
             resize(mWidth, mHeight);
-
+    
             ProgramVertex.Builder pvb = new ProgramVertex.Builder(mRS, null, null);
             pvb.setTextureMatrixEnable(true);
             mPV = pvb.create();
             mPV.setName("PV");
             mPV.bindAllocation(mPVA);
-
+    
             Element.Builder eb = new Element.Builder(mRS);
             eb.add(Element.createVector(mRS, Element.DataType.FLOAT_32, 2), "ImgSize");
             eb.add(Element.createVector(mRS, Element.DataType.FLOAT_32, 4), "Position");
             eb.add(Element.createVector(mRS, Element.DataType.FLOAT_32, 2), "BendPos");
             eb.add(Element.createVector(mRS, Element.DataType.FLOAT_32, 4), "ScaleOffset");
             Element e = eb.create();
-
+    
             mUniformAlloc = Allocation.createSized(mRS, e, 1);
-
+    
             initMesh();
             ProgramVertex.ShaderBuilder sb = new ProgramVertex.ShaderBuilder(mRS);
-            String t = new String("void main() {\n" +
-                                  // Animation
-                                  "  float ani = UNI_Position.z;\n" +
-
-                                  "  float bendY1 = UNI_BendPos.x;\n" +
-                                  "  float bendY2 = UNI_BendPos.y;\n" +
-                                  "  float bendAngle = 47.0 * (3.14 / 180.0);\n" +
-                                  "  float bendDistance = bendY1 * 0.4;\n" +
-                                  "  float distanceDimLevel = 0.6;\n" +
-
-                                  "  float bendStep = (bendAngle / bendDistance) * (bendAngle * 0.5);\n" +
-                                  "  float aDy = cos(bendAngle);\n" +
-                                  "  float aDz = sin(bendAngle);\n" +
-
-                                  "  float scale = (2.0 / 480.0);\n" +
-                                  "  float x = UNI_Position.x + UNI_ImgSize.x * (1.0 - ani) * (ATTRIB_position.x - 0.5);\n" +
-                                  "  float ys= UNI_Position.y + UNI_ImgSize.y * (1.0 - ani) * ATTRIB_position.y;\n" +
-                                  "  float y = 0.0;\n" +
-                                  "  float z = 0.0;\n" +
-                                  "  float lum = 1.0;\n" +
-
-                                  "  float cv = min(ys, bendY1 - bendDistance) - (bendY1 - bendDistance);\n" +
-                                  "  y += cv * aDy;\n" +
-                                  "  z += -cv * aDz;\n" +
-                                  "  cv = clamp(ys, bendY1 - bendDistance, bendY1) - bendY1;\n" +  // curve range
-                                  "  lum += cv / bendDistance * distanceDimLevel;\n" +
-                                  "  y += cv * cos(cv * bendStep);\n" +
-                                  "  z += cv * sin(cv * bendStep);\n" +
-
-                                  "  cv = max(ys, bendY2 + bendDistance) - (bendY2 + bendDistance);\n" +
-                                  "  y += cv * aDy;\n" +
-                                  "  z += cv * aDz;\n" +
-                                  "  cv = clamp(ys, bendY2, bendY2 + bendDistance) - bendY2;\n" +
-                                  "  lum -= cv / bendDistance * distanceDimLevel;\n" +
-                                  "  y += cv * cos(cv * bendStep);\n" +
-                                  "  z += cv * sin(cv * bendStep);\n" +
-
-                                  "  y += clamp(ys, bendY1, bendY2);\n" +
-
-                                  "  vec4 pos;\n" +
-                                  "  pos.x = (x + UNI_ScaleOffset.z) * UNI_ScaleOffset.x;\n" +
-                                  "  pos.y = (y + UNI_ScaleOffset.w) * UNI_ScaleOffset.x;\n" +
-                                  "  pos.z = z * UNI_ScaleOffset.x;\n" +
-                                  "  pos.w = 1.0;\n" +
-
-                                  "  pos.x *= 1.0 + ani * 4.0;\n" +
-                                  "  pos.y *= 1.0 + ani * 4.0;\n" +
-                                  "  pos.z -= ani * 1.5;\n" +
-                                  "  lum *= 1.0 - ani;\n" +
-
-                                  "  gl_Position = UNI_MVP * pos;\n" +
-                                  "  varColor.rgba = vec4(lum, lum, lum, 1.0);\n" +
-                                  "  varTex0.xy = ATTRIB_position;\n" +
-                                  "  varTex0.y = 1.0 - varTex0.y;\n" +
-                                  "  varTex0.zw = vec2(0.0, 0.0);\n" +
-                                  "}\n");
+            String t = "void main() {\n" +
+                    // Animation
+                    "  float ani = UNI_Position.z;\n" +
+    
+                    "  float bendY1 = UNI_BendPos.x;\n" +
+                    "  float bendY2 = UNI_BendPos.y;\n" +
+                    "  float bendAngle = 47.0 * (3.14 / 180.0);\n" +
+                    "  float bendDistance = bendY1 * 0.4;\n" +
+                    "  float distanceDimLevel = 0.6;\n" +
+    
+                    "  float bendStep = (bendAngle / bendDistance) * (bendAngle * 0.5);\n" +
+                    "  float aDy = cos(bendAngle);\n" +
+                    "  float aDz = sin(bendAngle);\n" +
+    
+                    "  float scale = (2.0 / 480.0);\n" +
+                    "  float x = UNI_Position.x + UNI_ImgSize.x * (1.0 - ani) * (ATTRIB_position.x - 0.5);\n" +
+                    "  float ys= UNI_Position.y + UNI_ImgSize.y * (1.0 - ani) * ATTRIB_position.y;\n" +
+                    "  float y = 0.0;\n" +
+                    "  float z = 0.0;\n" +
+                    "  float lum = 1.0;\n" +
+    
+                    "  float cv = min(ys, bendY1 - bendDistance) - (bendY1 - bendDistance);\n" +
+                    "  y += cv * aDy;\n" +
+                    "  z += -cv * aDz;\n" +
+                    "  cv = clamp(ys, bendY1 - bendDistance, bendY1) - bendY1;\n" +  // curve range
+                    "  lum += cv / bendDistance * distanceDimLevel;\n" +
+                    "  y += cv * cos(cv * bendStep);\n" +
+                    "  z += cv * sin(cv * bendStep);\n" +
+    
+                    "  cv = max(ys, bendY2 + bendDistance) - (bendY2 + bendDistance);\n" +
+                    "  y += cv * aDy;\n" +
+                    "  z += cv * aDz;\n" +
+                    "  cv = clamp(ys, bendY2, bendY2 + bendDistance) - bendY2;\n" +
+                    "  lum -= cv / bendDistance * distanceDimLevel;\n" +
+                    "  y += cv * cos(cv * bendStep);\n" +
+                    "  z += cv * sin(cv * bendStep);\n" +
+    
+                    "  y += clamp(ys, bendY1, bendY2);\n" +
+    
+                    "  vec4 pos;\n" +
+                    "  pos.x = (x + UNI_ScaleOffset.z) * UNI_ScaleOffset.x;\n" +
+                    "  pos.y = (y + UNI_ScaleOffset.w) * UNI_ScaleOffset.x;\n" +
+                    "  pos.z = z * UNI_ScaleOffset.x;\n" +
+                    "  pos.w = 1.0;\n" +
+    
+                    "  pos.x *= 1.0 + ani * 4.0;\n" +
+                    "  pos.y *= 1.0 + ani * 4.0;\n" +
+                    "  pos.z -= ani * 1.5;\n" +
+                    "  lum *= 1.0 - ani;\n" +
+    
+                    "  gl_Position = UNI_MVP * pos;\n" +
+                    "  varColor.rgba = vec4(lum, lum, lum, 1.0);\n" +
+                    "  varTex0.xy = ATTRIB_position;\n" +
+                    "  varTex0.y = 1.0 - varTex0.y;\n" +
+                    "  varTex0.zw = vec2(0.0, 0.0);\n" +
+                    "}\n";
             sb.setShader(t);
             sb.addConstant(mUniformAlloc.getType());
             sb.addInput(mMesh.getVertexType(0).getElement());
@@ -1016,10 +1021,10 @@ public class AllApps3D extends RSSurfaceView
             mPVCurve.setName("PVCurve");
             mPVCurve.bindAllocation(mPVA);
             mPVCurve.bindConstants(mUniformAlloc, 1);
-
+    
             mRS.contextBindProgramVertex(mPV);
         }
-
+    
         private void initProgramFragment() {
             Sampler.Builder sb = new Sampler.Builder(mRS);
             sb.setMin(Sampler.Value.LINEAR_MIP_LINEAR);
@@ -1027,30 +1032,30 @@ public class AllApps3D extends RSSurfaceView
             sb.setWrapS(Sampler.Value.CLAMP);
             sb.setWrapT(Sampler.Value.CLAMP);
             Sampler linear = sb.create();
-
+    
             sb.setMin(Sampler.Value.NEAREST);
             sb.setMag(Sampler.Value.NEAREST);
             Sampler nearest = sb.create();
-
+    
             ProgramFragment.Builder bf = new ProgramFragment.Builder(mRS);
             bf.setTexture(ProgramFragment.Builder.EnvMode.MODULATE,
                           ProgramFragment.Builder.Format.RGBA, 0);
             mPFTexMip = bf.create();
             mPFTexMip.setName("PFTexMip");
             mPFTexMip.bindSampler(linear, 0);
-
+    
             mPFTexNearest = bf.create();
             mPFTexNearest.setName("PFTexNearest");
             mPFTexNearest.bindSampler(nearest, 0);
-
+    
             bf.setTexture(ProgramFragment.Builder.EnvMode.MODULATE,
                           ProgramFragment.Builder.Format.ALPHA, 0);
             mPFTexMipAlpha = bf.create();
             mPFTexMipAlpha.setName("PFTexMipAlpha");
             mPFTexMipAlpha.bindSampler(linear, 0);
-
+    
         }
-
+    
         private void initProgramStore() {
             ProgramStore.Builder bs = new ProgramStore.Builder(mRS, null, null);
             bs.setDepthFunc(ProgramStore.DepthFunc.ALWAYS);
@@ -1061,23 +1066,23 @@ public class AllApps3D extends RSSurfaceView
             mPSIcons = bs.create();
             mPSIcons.setName("PSIcons");
         }
-
+    
         private void initGl() {
-            mTouchXBorders = new int[Defines.COLUMNS_PER_PAGE+1];
-            mTouchYBorders = new int[Defines.ROWS_PER_PAGE+1];
+            mTouchXBorders = new int[mColumnsPerPage +1];
+            mTouchYBorders = new int[mRowsPerPage +1];
         }
-
+    
         private void initData() {
             mParams = new Params();
             mState = new State();
-
+    
             final Utilities.BubbleText bubble = new Utilities.BubbleText(getContext());
-
+    
             mParams.bubbleWidth = bubble.getBubbleWidth();
             mParams.bubbleHeight = bubble.getMaxBubbleHeight();
             mParams.bubbleBitmapWidth = bubble.getBitmapWidth();
             mParams.bubbleBitmapHeight = bubble.getBitmapHeight();
-
+    
             mHomeButtonNormal = Allocation.createFromBitmapResource(mRS, mRes,
                     R.drawable.home_button_normal, Element.RGBA_8888(mRS), false);
             mHomeButtonNormal.uploadToTexture(0);
@@ -1091,22 +1096,19 @@ public class AllApps3D extends RSSurfaceView
             mParams.homeButtonHeight = 68;
             mParams.homeButtonTextureWidth = 128;
             mParams.homeButtonTextureHeight = 128;
-
+    
             mState.homeButtonId = mHomeButtonNormal.getID();
-
+    
             mParams.save();
             mState.save();
-
+    
             mSelectionBitmap = Bitmap.createBitmap(Defines.SELECTION_TEXTURE_WIDTH_PX,
                     Defines.SELECTION_TEXTURE_HEIGHT_PX, Bitmap.Config.ARGB_8888);
             mSelectionCanvas = new Canvas(mSelectionBitmap);
-
+    
             setApps(null);
         }
-
-        private void initScript(int id) {
-        }
-
+    
         private void initRs() {
             ScriptC.Builder sb = new ScriptC.Builder(mRS);
             sb.setScript(mRes, R.raw.allapps);
@@ -1127,33 +1129,32 @@ public class AllApps3D extends RSSurfaceView
             mScript.bindAllocation(mAllocIconIds, Defines.ALLOC_ICON_IDS);
             mScript.bindAllocation(mAllocLabelIds, Defines.ALLOC_LABEL_IDS);
             mScript.bindAllocation(mUniformAlloc, Defines.ALLOC_VP_CONSTANTS);
-
+    
             mRS.contextBindRootScript(mScript);
         }
-
+    
         void dirtyCheck() {
             if (mZoomDirty) {
                 setZoom(mNextZoom, mAnimateNextZoom);
             }
         }
-
+    
+        @SuppressWarnings({"ConstantConditions"})
         private void setApps(ArrayList<ApplicationInfo> list) {
             final int count = list != null ? list.size() : 0;
             int allocCount = count;
             if (allocCount < 1) {
                 allocCount = 1;
             }
-
+    
             mIcons = new Allocation[count];
             mIconIds = new int[allocCount];
             mAllocIconIds = Allocation.createSized(mRS, Element.USER_I32(mRS), allocCount);
-
+    
             mLabels = new Allocation[count];
             mLabelIds = new int[allocCount];
             mAllocLabelIds = Allocation.createSized(mRS, Element.USER_I32(mRS), allocCount);
-
-            Element ie8888 = Element.RGBA_8888(mRS);
-
+    
             mState.iconCount = count;
             for (int i=0; i < mState.iconCount; i++) {
                 createAppIconAllocations(i, list.get(i));
@@ -1163,7 +1164,7 @@ public class AllApps3D extends RSSurfaceView
             }
             saveAppsList();
         }
-
+    
         private void setZoom(float zoom, boolean animate) {
             mRollo.clearSelectedIcon();
             mRollo.setHomeSelected(SELECTED_NONE);
@@ -1177,7 +1178,7 @@ public class AllApps3D extends RSSurfaceView
                 mRollo.mInvokeSetZoom.execute();
             }
         }
-
+    
         private void createAppIconAllocations(int index, ApplicationInfo item) {
             mIcons[index] = Allocation.createFromBitmap(mRS, item.iconBitmap,
                     Element.RGBA_8888(mRS), true);
@@ -1186,7 +1187,7 @@ public class AllApps3D extends RSSurfaceView
             mIconIds[index] = mIcons[index].getID();
             mLabelIds[index] = mLabels[index].getID();
         }
-
+    
         private void uploadAppIcon(int index, ApplicationInfo item) {
             if (mIconIds[index] != mIcons[index].getID()) {
                 throw new IllegalStateException("uploadAppIcon index=" + index
@@ -1197,7 +1198,7 @@ public class AllApps3D extends RSSurfaceView
             mIcons[index].uploadToTexture(0);
             mLabels[index].uploadToTexture(0);
         }
-
+    
         /**
          * Puts the empty spaces at the end.  Updates mState.iconCount.  You must
          * fill in the values and call saveAppsList().
@@ -1206,62 +1207,62 @@ public class AllApps3D extends RSSurfaceView
             Allocation[] icons = new Allocation[count];
             int[] iconIds = new int[count];
             mAllocIconIds = Allocation.createSized(mRS, Element.USER_I32(mRS), count);
-
+    
             Allocation[] labels = new Allocation[count];
             int[] labelIds = new int[count];
             mAllocLabelIds = Allocation.createSized(mRS, Element.USER_I32(mRS), count);
-
+    
             final int oldCount = mRollo.mState.iconCount;
-
+    
             System.arraycopy(mIcons, 0, icons, 0, oldCount);
             System.arraycopy(mIconIds, 0, iconIds, 0, oldCount);
             System.arraycopy(mLabels, 0, labels, 0, oldCount);
             System.arraycopy(mLabelIds, 0, labelIds, 0, oldCount);
-
+    
             mIcons = icons;
             mIconIds = iconIds;
             mLabels = labels;
             mLabelIds = labelIds;
         }
-
+    
         /**
          * Handle the allocations for the new app.  Make sure you call saveAppsList when done.
          */
         private void addApp(int index, ApplicationInfo item) {
             final int count = mState.iconCount - index;
             final int dest = index + 1;
-
+    
             System.arraycopy(mIcons, index, mIcons, dest, count);
             System.arraycopy(mIconIds, index, mIconIds, dest, count);
             System.arraycopy(mLabels, index, mLabels, dest, count);
             System.arraycopy(mLabelIds, index, mLabelIds, dest, count);
-
+    
             createAppIconAllocations(index, item);
             uploadAppIcon(index, item);
             mRollo.mState.iconCount++;
         }
-
+    
         /**
          * Handle the allocations for the removed app.  Make sure you call saveAppsList when done.
          */
         private void removeApp(int index) {
             final int count = mState.iconCount - index - 1;
             final int src = index + 1;
-
+    
             System.arraycopy(mIcons, src, mIcons, index, count);
             System.arraycopy(mIconIds, src, mIconIds, index, count);
             System.arraycopy(mLabels, src, mLabels, index, count);
             System.arraycopy(mLabelIds, src, mLabelIds, index, count);
-
+    
             mRollo.mState.iconCount--;
             final int last = mState.iconCount;
-
+    
             mIcons[last] = null;
             mIconIds[last] = 0;
             mLabels[last] = null;
             mLabelIds[last] = 0;
         }
-
+    
         /**
          * Send the apps list structures to RS.
          */
@@ -1269,93 +1270,96 @@ public class AllApps3D extends RSSurfaceView
             // WTF: how could mScript be not null but mAllocIconIds null b/2460740.
             if (mScript != null && mAllocIconIds != null) {
                 mRS.contextBindRootScript(null);
-
+    
                 mAllocIconIds.data(mIconIds);
                 mAllocLabelIds.data(mLabelIds);
-
+    
                 mScript.bindAllocation(mAllocIconIds, Defines.ALLOC_ICON_IDS);
                 mScript.bindAllocation(mAllocLabelIds, Defines.ALLOC_LABEL_IDS);
-
+    
                 mState.save();
-
+    
                 // Note: mScript may be null if we haven't initialized it yet.
                 // In that case, this is a no-op.
                 if (mInvokeResetWAR != null) {
                     mInvokeResetWAR.execute();
                 }
-
+    
                 mRS.contextBindRootScript(mScript);
             }
         }
-
+    
         void initTouchState() {
-            int width = getWidth();
-            int height = getHeight();
-            int cellHeight = 145;//iconsSize / Defines.ROWS_PER_PAGE;
-            int cellWidth = width / Defines.COLUMNS_PER_PAGE;
-
-            int centerY = (height / 2);
-            mTouchYBorders[0] = centerY - (cellHeight * 2);
-            mTouchYBorders[1] = centerY - cellHeight;
-            mTouchYBorders[2] = centerY;
-            mTouchYBorders[3] = centerY + cellHeight;
-            mTouchYBorders[4] = centerY + (cellHeight * 2);
-
-            int centerX = (width / 2);
-            mTouchXBorders[0] = 0;
-            mTouchXBorders[1] = centerX - (width / 4);
-            mTouchXBorders[2] = centerX;
-            mTouchXBorders[3] = centerX + (width / 4);
-            mTouchXBorders[4] = width;
+            boolean isPortrait = getWidth() < getHeight();
+            // TODO: Put this in a config file/define
+            int cellHeight = 145;//iconsSize / Defines.ROWS_PER_PAGE_PORTRAIT;
+            if (!isPortrait) cellHeight -= 12;
+            int centerY = (int) (getHeight() * (isPortrait ? 0.5f : 0.47f));
+            if (!isPortrait) centerY += cellHeight / 2;
+            int half = (int) Math.floor((mRowsPerPage + 1) / 2);
+            int end = mTouchYBorders.length - (half + 1);
+    
+            for (int i = -half; i <= end; i++) {
+                mTouchYBorders[i + half] = centerY + i * cellHeight;
+            }
+    
+            int x = 0;
+            // TODO: Put this in a config file/define
+            int columnWidth = 120;
+            for (int i = 0; i < mColumnsPerPage + 1; i++) {
+                mTouchXBorders[i] = x;
+                x += columnWidth;
+            }
         }
-
+    
         void fling() {
             mInvokeFling.execute();
         }
-
+    
         void move() {
             mInvokeMove.execute();
         }
-
+    
         void moveTo(float row) {
             mState.targetPos = row;
             mState.save();
             mInvokeMoveTo.execute();
         }
-
+    
         int chooseTappedIcon(int x, int y, float pos) {
             // Adjust for scroll position if not zero.
             y += (pos - ((int)pos)) * (mTouchYBorders[1] - mTouchYBorders[0]);
-
+    
             int col = -1;
             int row = -1;
-            for (int i=0; i<Defines.COLUMNS_PER_PAGE; i++) {
+            final int columnsCount = mColumnsPerPage;
+            for (int i=0; i< columnsCount; i++) {
                 if (x >= mTouchXBorders[i] && x < mTouchXBorders[i+1]) {
                     col = i;
                     break;
                 }
             }
-            for (int i=0; i<Defines.ROWS_PER_PAGE; i++) {
+            final int rowsCount = mRowsPerPage;
+            for (int i=0; i< rowsCount; i++) {
                 if (y >= mTouchYBorders[i] && y < mTouchYBorders[i+1]) {
                     row = i;
                     break;
                 }
             }
-
+    
             if (row < 0 || col < 0) {
                 return -1;
             }
-
-            int index = (((int)pos) * Defines.COLUMNS_PER_PAGE)
-                    + (row * Defines.ROWS_PER_PAGE) + col;
-
+    
+            int index = (((int)pos) * columnsCount) + (row * columnsCount) + col;
+    
             if (index >= mState.iconCount) {
                 return -1;
             } else {
                 return index;
             }
         }
-
+    
         /**
          * You need to call save() on mState on your own after calling this.
          *
@@ -1366,7 +1370,7 @@ public class AllApps3D extends RSSurfaceView
             selectIcon(index, pressed);
             return index;
         }
-
+    
         /**
          * Select the icon at the given index.
          *
@@ -1383,22 +1387,22 @@ public class AllApps3D extends RSSurfaceView
                 if (pressed == SELECTED_FOCUSED) {
                     mLastSelection = SELECTION_ICONS;
                 }
-
+    
                 int prev = mState.selectedIconIndex;
                 mState.selectedIconIndex = index;
-
+    
                 ApplicationInfo info = mAllAppsList.get(index);
                 Bitmap selectionBitmap = mSelectionBitmap;
-
+    
                 Utilities.drawSelectedAllAppsBitmap(mSelectionCanvas,
                         selectionBitmap.getWidth(), selectionBitmap.getHeight(),
                         pressed == SELECTED_PRESSED, info.iconBitmap);
-
+    
                 mSelectedIcon = Allocation.createFromBitmap(mRS, selectionBitmap,
                         Element.RGBA_8888(mRS), false);
                 mSelectedIcon.uploadToTexture(0);
                 mState.selectedIconTexture = mSelectedIcon.getID();
-
+    
                 if (prev != index) {
                     if (info.title != null && info.title.length() > 0) {
                         //setContentDescription(info.title);
@@ -1407,14 +1411,14 @@ public class AllApps3D extends RSSurfaceView
                 }
             }
         }
-
+    
         /**
          * You need to call save() on mState on your own after calling this.
          */
         void clearSelectedIcon() {
             mState.selectedIconIndex = -1;
         }
-
+    
         void setHomeSelected(int mode) {
             final int prev = mLastSelection;
             switch (mode) {
@@ -1433,11 +1437,11 @@ public class AllApps3D extends RSSurfaceView
                 break;
             }
         }
-
+    
         public void dumpState() {
             Log.d(TAG, "mRollo.mWidth=" + mWidth);
             Log.d(TAG, "mRollo.mHeight=" + mHeight);
-            Log.d(TAG, "mRollo.mIcons=" + mIcons);
+            Log.d(TAG, "mRollo.mIcons=" + Arrays.toString(mIcons));
             if (mIcons != null) {
                 Log.d(TAG, "mRollo.mIcons.length=" + mIcons.length);
             }
@@ -1470,7 +1474,7 @@ public class AllApps3D extends RSSurfaceView
             Log.d(TAG, "mRollo.mParams.homeButtonTextureHeight=" + mParams.homeButtonTextureHeight);
         }
     }
-
+    
     public void dumpState() {
         Log.d(TAG, "mRS=" + mRS);
         Log.d(TAG, "mRollo=" + mRollo);
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 01a6df4e9..04f40403a 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -16,44 +16,12 @@
 
 package com.android.launcher2;
 
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.SystemClock;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.ViewGroup;
-import android.view.MotionEvent;
-import android.view.LayoutInflater;
-import android.view.SoundEffectConstants;
-import android.view.SurfaceHolder;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.ViewConfiguration;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.AdapterView;
-import android.widget.TextView;
-import android.widget.ArrayAdapter;
-import android.widget.GridView;
-
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-
 
 public interface AllAppsView {
     public interface Watcher {
         public void zoomed(float zoom);
-    };
+    }
 
     public void setLauncher(Launcher launcher);
 
@@ -75,5 +43,3 @@ public interface AllAppsView {
 
     public void dumpState();
 }
-
-
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5146ffdd4..d09a91272 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -26,16 +26,13 @@ import android.app.StatusBarManager;
 import android.app.WallpaperManager;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
 import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
@@ -63,7 +60,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnLongClickListener;
-import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;