diff --git a/res/drawable/pattern_carbon_fiber_dark.png b/res/drawable/pattern_carbon_fiber_dark.png deleted file mode 100644 index 44e050f4c9..0000000000 Binary files a/res/drawable/pattern_carbon_fiber_dark.png and /dev/null differ 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 @@ - - - - - - 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);