PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix id collision in Home.

Browse Source
This commit is contained in:
Joe Onorato
2009-09-21 15:37:59 -04:00
parent 44c9b646b7
commit 9244230763
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout-land/live_folder_grid.xml
+2 -2
View File
@@ -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"
res/layout-land/user_folder.xml
+2 -2
View File
@@ -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"
res/layout-port/live_folder_grid.xml
+2 -2
View File
@@ -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"
res/layout-port/user_folder.xml
+2 -2
View File
@@ -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"
res/layout/live_folder_list.xml
+2 -2
View File
@@ -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"
src/com/android/launcher2/Folder.java
+2 -2
View File
@@ -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);
}