commit 1a94ee3a8b2f46c5b46acff15ba9d22dfca36261
author Jason Sams <rjsams@android.com> Wed Jan 20 13:34:30 2010 -0800
committer Jason Sams <rjsams@android.com> Wed Jan 20 13:34:30 2010 -0800
tree 3c2cda29a24523366c4b6b628282b223e59b40a8
parent 37f262d924a177472957d8e68793c9433f2a2de4

Fix selection highligh in all apps.  Selection highlight now follows the curve and uses a smaller bitmap.

res/raw/allapps.rs

diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 1502a55..abcf0dc 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -291,21 +291,21 @@
 
             if (iconNum >= 0) {
                 float x = colWidth * col + (colWidth / 2);
-
-                bindProgramFragment(NAMED_PFTexMip);
-
                 storeF(ALLOC_VP_CONSTANTS, 2, x);
-                storeF(ALLOC_VP_CONSTANTS, 3, y);
+
                 if (state->selectedIconIndex == iconNum && !p) {
-                    //bindTexture(NAMED_PFTexMip, 0, state->selectedIconTexture);
-                    //bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum));
-                    //storeF(ALLOC_VP_CONSTANTS, 0, 100.f);
-                    //storeF(ALLOC_VP_CONSTANTS, 1, 100.f);
-                    //drawSimpleMesh(NAMED_SMCell);
+                    bindProgramFragment(NAMED_PFTexNearest);
+                    bindTexture(NAMED_PFTexNearest, 0, state->selectedIconTexture);
+                    storeF(ALLOC_VP_CONSTANTS, 0, SELECTION_TEXTURE_WIDTH_PX);
+                    storeF(ALLOC_VP_CONSTANTS, 1, SELECTION_TEXTURE_HEIGHT_PX);
+                    storeF(ALLOC_VP_CONSTANTS, 3, y - (SELECTION_TEXTURE_HEIGHT_PX - ICON_TEXTURE_HEIGHT_PX) * 0.5f);
+                    drawSimpleMesh(NAMED_SMCell);
                 }
 
-                storeF(ALLOC_VP_CONSTANTS, 0, 74.f);
-                storeF(ALLOC_VP_CONSTANTS, 1, 74.f);
+                bindProgramFragment(NAMED_PFTexMip);
+                storeF(ALLOC_VP_CONSTANTS, 0, ICON_TEXTURE_WIDTH_PX);
+                storeF(ALLOC_VP_CONSTANTS, 1, ICON_TEXTURE_HEIGHT_PX);
+                storeF(ALLOC_VP_CONSTANTS, 3, y);
                 bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum));
                 drawSimpleMesh(NAMED_SMCell);
 

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 424bc55..999844d 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -134,10 +134,12 @@
         public static final int ROWS_PER_PAGE = 4;
 
         public static final int ICON_WIDTH_PX = 64;
-        public static final int ICON_TEXTURE_WIDTH_PX = 128;
+        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 = 128;
+        public static final int ICON_TEXTURE_HEIGHT_PX = 74;
+        public static final int SELECTION_TEXTURE_HEIGHT_PX = 74 + 20;
 
         public int SCREEN_WIDTH_PX;
         public int SCREEN_HEIGHT_PX;
@@ -1075,8 +1077,8 @@
             mParams.save();
             mState.save();
 
-            mSelectionBitmap = Bitmap.createBitmap(Defines.ICON_TEXTURE_WIDTH_PX,
-                    Defines.ICON_TEXTURE_HEIGHT_PX, Bitmap.Config.ARGB_8888);
+            mSelectionBitmap = Bitmap.createBitmap(Defines.SELECTION_TEXTURE_WIDTH_PX,
+                    Defines.SELECTION_TEXTURE_HEIGHT_PX, Bitmap.Config.ARGB_8888);
             mSelectionCanvas = new Canvas(mSelectionBitmap);
 
             setApps(null);