From fde104bfe937d06e0f47d0c7ca7eb7a37d54905e Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Fri, 31 Jul 2009 12:01:34 -0700
Subject: [PATCH] no texture for the all apps grid.

---
 res/drawable/pattern_carbon_fiber_dark.png    | Bin 419 -> 0 bytes
 res/layout-land/all_apps.xml                  |   2 -
 res/layout-port/all_apps.xml                  |   2 -
 res/values/attrs.xml                          |   7 ---
 .../android/launcher2/AllAppsGridView.java    |  42 ------------------
 5 files changed, 53 deletions(-)
 delete mode 100644 res/drawable/pattern_carbon_fiber_dark.png

diff --git a/res/drawable/pattern_carbon_fiber_dark.png b/res/drawable/pattern_carbon_fiber_dark.png
deleted file mode 100644
index 44e050f4c933f8d2870e7fc6ae1bd8c5b874b8a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1SGeyEo=o+k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7+pPG978H@y}544bwokL^`gtZ-9`Ub3;AjvS|Ty$yvT9C
zJjs)f@2uULZMpaRS1G|)Go!qA+R1+n>9u@bRsQ#)=`jiY`;NAu-^KUJehs-BU$XY=
z)BbgJv4@+Uh9u80Z4=X3-o|=*W#YjiEy+oWlB-fY+EOwOo|wQBYNX<9v?T$^2TMd5
z0QpmSPEO#_m5`jY(5nq7A=bllGC<WCD8cR4ma+n<ebPc!WoM%hpsJG>nkEhg;|}j%
d(a*rl5GZ=*mdlwfF~Cq~@O1TaS?83{1OTPkoHhUe

diff --git a/res/layout-land/all_apps.xml b/res/layout-land/all_apps.xml
index 1927394aef..35adb6793b 100644
--- a/res/layout-land/all_apps.xml
+++ b/res/layout-land/all_apps.xml
@@ -22,8 +22,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
 
-    launcher:texture="@drawable/pattern_carbon_fiber_dark"
-
     android:scrollbarStyle="outsideInset"
     android:drawSelectorOnTop="false"
     android:listSelector="@drawable/grid_selector"
diff --git a/res/layout-port/all_apps.xml b/res/layout-port/all_apps.xml
index 92ca0f6584..c954685c4f 100644
--- a/res/layout-port/all_apps.xml
+++ b/res/layout-port/all_apps.xml
@@ -22,8 +22,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
 
-    launcher:texture="@drawable/pattern_carbon_fiber_dark"
-
     android:scrollbarStyle="outsideInset"
     android:drawSelectorOnTop="false"
     android:listSelector="@drawable/grid_selector"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1fcad8160d..fb8a4df874 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -69,13 +69,6 @@
         <attr name="direction" />
     </declare-styleable>
 
-    <!-- AllAppsGridView specific attributes. These attributes are used to customize
-         the list of all apps in XML files. -->
-    <declare-styleable name="AllAppsGridView">
-        <!-- The background texture. -->
-        <attr name="texture" format="reference"  />
-    </declare-styleable>
-
     <!-- XML attributes used by default_workspace.xml -->
     <declare-styleable name="Favorite">
         <attr name="className" format="string" />
diff --git a/src/com/android/launcher2/AllAppsGridView.java b/src/com/android/launcher2/AllAppsGridView.java
index 7e1b54e2fb..cca9ed2ef3 100644
--- a/src/com/android/launcher2/AllAppsGridView.java
+++ b/src/com/android/launcher2/AllAppsGridView.java
@@ -32,10 +32,6 @@ public class AllAppsGridView extends GridView implements AdapterView.OnItemClick
 
     private DragController mDragger;
     private Launcher mLauncher;
-    private Bitmap mTexture;
-    private Paint mPaint;
-    private int mTextureWidth;
-    private int mTextureHeight;
 
     public AllAppsGridView(Context context) {
         super(context);
@@ -47,18 +43,6 @@ public class AllAppsGridView extends GridView implements AdapterView.OnItemClick
 
     public AllAppsGridView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AllAppsGridView, defStyle, 0);
-        final int textureId = a.getResourceId(R.styleable.AllAppsGridView_texture, 0);
-        if (textureId != 0) {
-            mTexture = BitmapFactory.decodeResource(getResources(), textureId);
-            mTextureWidth = mTexture.getWidth();
-            mTextureHeight = mTexture.getHeight();
-
-            mPaint = new Paint();
-            mPaint.setDither(false);
-        }
-        a.recycle();
     }
 
     @Override
@@ -67,32 +51,6 @@ public class AllAppsGridView extends GridView implements AdapterView.OnItemClick
         setOnItemLongClickListener(this);
     }
 
-    @Override
-    public void draw(Canvas canvas) {
-        final Bitmap texture = mTexture;
-        final Paint paint = mPaint;
-
-        final int width = getWidth();
-        final int height = getHeight();
-
-        final int textureWidth = mTextureWidth;
-        final int textureHeight = mTextureHeight;
-
-        int x = 0;
-        int y;
-
-        while (x < width) {
-            y = 0;
-            while (y < height) {
-                canvas.drawBitmap(texture, x, y, paint);
-                y += textureHeight;
-            }
-            x += textureWidth;
-        }
-
-        super.draw(canvas);
-    }
-
     public void onItemClick(AdapterView parent, View v, int position, long id) {
         ApplicationInfo app = (ApplicationInfo) parent.getItemAtPosition(position);
         mLauncher.startActivitySafely(app.intent);