From d2eca6b66e654e71fb46ae718910af3ec6c2cf9c Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 26 Jul 2011 22:49:13 -0700 Subject: [PATCH] Fixing issue 5064135, issue 5033850 -> id's were duplicated causing strange behaviour in onRestoreInstanceState Change-Id: I20132942baaec54880c6d765b37d26ac2ffd31ee --- res/layout-land/folder_icon.xml | 2 +- res/layout-port/folder_icon.xml | 2 +- src/com/android/launcher2/FolderIcon.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml index e9d2b960a2..15867c71a2 100644 --- a/res/layout-land/folder_icon.xml +++ b/res/layout-land/folder_icon.xml @@ -27,6 +27,6 @@ android:layout_height="@dimen/folder_preview_size" android:src="@drawable/portal_ring_inner_holo"/> diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml index adc0e6a06d..69e51e8639 100644 --- a/res/layout-port/folder_icon.xml +++ b/res/layout-port/folder_icon.xml @@ -27,6 +27,6 @@ android:layout_height="@dimen/folder_preview_size" android:src="@drawable/portal_ring_inner_holo"/> diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 949a25e58e..07ae5b8e2e 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -116,7 +116,7 @@ public class FolderIcon extends LinearLayout implements FolderListener { FolderIcon icon = (FolderIcon) LayoutInflater.from(launcher).inflate(resId, group, false); - icon.mFolderName = (BubbleTextView) icon.findViewById(R.id.folder_name); + icon.mFolderName = (BubbleTextView) icon.findViewById(R.id.folder_icon_name); icon.mFolderName.setText(folderInfo.title); icon.mPreviewBackground = (ImageView) icon.findViewById(R.id.preview_background); icon.mPreviewBackground.setContentDescription(folderInfo.title);