diff options
-rw-r--r-- | CleanSpec.mk | 1 | ||||
-rw-r--r-- | res/layout/application_list.xml | 69 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 7 |
3 files changed, 5 insertions, 72 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 444dbd887..eb24cca08 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -45,6 +45,7 @@ #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/res/layout/application_list.xml b/res/layout/application_list.xml deleted file mode 100644 index b515c9e59..000000000 --- a/res/layout/application_list.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2008, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - - android:paddingLeft="10dip" - - android:orientation="horizontal"> - - <ImageView android:id="@+id/icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:layout_gravity="center_vertical" - android:scaleType="fitCenter" /> - - <LinearLayout - android:layout_width="0dip" - android:layout_weight="1.0" - android:layout_height="match_parent" - - android:paddingLeft="8dip" - android:paddingRight="8dip" - - android:orientation="vertical" - android:gravity="center_vertical"> - - <TextView android:id="@+id/name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - - android:singleLine="true" - android:ellipsize="end" - - android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView android:id="@+id/description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - - android:layout_below="@id/name" - android:layout_alignLeft="@id/name" - - android:singleLine="true" - android:ellipsize="end" - - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" /> - - </LinearLayout> - -</LinearLayout> diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index b32237afe..76d01a7f0 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2218,11 +2218,12 @@ public final class Launcher extends Activity for (int i = 0; i < count; i++) { ((ImageView) group.getChildAt(i)).setImageDrawable(null); } - ArrayList<Bitmap> bitmaps = (ArrayList<Bitmap>) v.getTag(R.id.icon); + ArrayList<Bitmap> bitmaps = + (ArrayList<Bitmap>) v.getTag(R.id.all_apps_button_cluster); for (Bitmap bitmap : bitmaps) bitmap.recycle(); v.setTag(R.id.workspace, null); - v.setTag(R.id.icon, null); + v.setTag(R.id.all_apps_button_cluster, null); window.setOnDismissListener(null); } }); @@ -2314,7 +2315,7 @@ public final class Launcher extends Activity anchor.setTag(p); anchor.setTag(R.id.workspace, preview); - anchor.setTag(R.id.icon, bitmaps); + anchor.setTag(R.id.all_apps_button_cluster, bitmaps); } class PreviewTouchHandler implements View.OnClickListener, Runnable, View.OnFocusChangeListener { |