From 924423076381925909c4e3cb176fc16fe6d21462 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Mon, 21 Sep 2009 15:37:59 -0400
Subject: [PATCH] Fix id collision in Home.

---
 res/layout-land/live_folder_grid.xml  | 4 ++--
 res/layout-land/user_folder.xml       | 4 ++--
 res/layout-port/live_folder_grid.xml  | 4 ++--
 res/layout-port/user_folder.xml       | 4 ++--
 res/layout/live_folder_list.xml       | 4 ++--
 src/com/android/launcher2/Folder.java | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml
index 9a87628c7c..572c295468 100644
--- a/res/layout-land/live_folder_grid.xml
+++ b/res/layout-land/live_folder_grid.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical">
     
     <Button
-        android:id="@+id/close"
+        android:id="@+id/folder_close"
     	android:background="@drawable/box_launcher_top"
         android:gravity="left|center_vertical"
         android:textSize="14sp"
@@ -31,7 +31,7 @@
     	android:layout_height="wrap_content" />
 
     <GridView
-        android:id="@+id/content"
+        android:id="@+id/folder_content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
index 9d419f5e93..645c02f740 100644
--- a/res/layout-land/user_folder.xml
+++ b/res/layout-land/user_folder.xml
@@ -18,7 +18,7 @@
     android:orientation="vertical">
     
     <Button
-        android:id="@+id/close"
+        android:id="@+id/folder_close"
     	android:background="@drawable/box_launcher_top"
         android:gravity="left|center_vertical"
         android:textSize="14sp"
@@ -28,7 +28,7 @@
     	android:layout_height="wrap_content" />
 
     <GridView
-        android:id="@+id/content"
+        android:id="@id/folder_content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"
diff --git a/res/layout-port/live_folder_grid.xml b/res/layout-port/live_folder_grid.xml
index 1f82216ffd..51e5e47fcf 100644
--- a/res/layout-port/live_folder_grid.xml
+++ b/res/layout-port/live_folder_grid.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical">
         
     <Button
-        android:id="@+id/close"
+        android:id="@+id/folder_close"
    		android:background="@drawable/box_launcher_top"
         android:gravity="left|center_vertical"
         android:textSize="14sp"
@@ -31,7 +31,7 @@
     	android:layout_height="wrap_content" />
 
     <GridView
-        android:id="@id/content"
+        android:id="@id/folder_content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"
diff --git a/res/layout-port/user_folder.xml b/res/layout-port/user_folder.xml
index 3d0dfb7fc3..6a189dc33f 100644
--- a/res/layout-port/user_folder.xml
+++ b/res/layout-port/user_folder.xml
@@ -18,7 +18,7 @@
     android:orientation="vertical">
         
     <Button
-        android:id="@+id/close"
+        android:id="@+id/folder_close"
    		android:background="@drawable/box_launcher_top"
         android:gravity="left|center_vertical"
         android:textSize="14sp"
@@ -28,7 +28,7 @@
     	android:layout_height="wrap_content" />
 
     <GridView
-        android:id="@id/content"
+        android:id="@id/folder_content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"
diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml
index cf2f836f2b..cf3d2f13ad 100644
--- a/res/layout/live_folder_list.xml
+++ b/res/layout/live_folder_list.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical">
     
     <Button
-        android:id="@+id/close"
+        android:id="@+id/folder_close"
     	android:background="@drawable/box_launcher_top"
         android:gravity="left|center_vertical"
         android:textSize="14sp"
@@ -31,7 +31,7 @@
     	android:layout_height="wrap_content" />
 
     <ListView
-        android:id="@+id/content"
+        android:id="@id/folder_content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index bc5f9fd3b2..4f66ad0520 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -64,11 +64,11 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mContent = (AbsListView) findViewById(R.id.content);
+        mContent = (AbsListView) findViewById(R.id.folder_content);
         mContent.setOnItemClickListener(this);
         mContent.setOnItemLongClickListener(this);
         
-        mCloseButton = (Button) findViewById(R.id.close);
+        mCloseButton = (Button) findViewById(R.id.folder_close);
         mCloseButton.setOnClickListener(this);
         mCloseButton.setOnLongClickListener(this);
     }