Fix bug 3126193 - over-scroll glow extends beyond folder bounds
Fixed a layout problem in Launcher2 where lists and grids did not have
proper containers.
Change-Id: I683e42362345a9c9d18d957e84bb8522675fdfc6
diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml
index 44519d4..1796756 100644
--- a/res/layout-land/live_folder_grid.xml
+++ b/res/layout-land/live_folder_grid.xml
@@ -30,21 +30,26 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
- <GridView
- android:id="@+id/folder_content"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
-
- android:cacheColorHint="#ff333333"
- android:background="@drawable/box_launcher_bottom"
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:background="@drawable/box_launcher_bottom">
- android:scrollbarAlwaysDrawVerticalTrack="true"
- android:scrollbarStyle="insideInset"
- android:drawSelectorOnTop="false"
- android:listSelector="@drawable/grid_selector"
+ <GridView
+ android:id="@+id/folder_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
- android:verticalSpacing="10dip"
- android:numColumns="5" />
+ android:cacheColorHint="#ff333333"
+
+ android:scrollbarAlwaysDrawVerticalTrack="true"
+ android:scrollbarStyle="insideInset"
+ android:drawSelectorOnTop="false"
+ android:listSelector="@drawable/grid_selector"
+
+ android:verticalSpacing="10dip"
+ android:numColumns="5" />
+ </FrameLayout>
</com.android.launcher2.LiveFolder>
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
index b05974a..5da4aa5 100644
--- a/res/layout-land/user_folder.xml
+++ b/res/layout-land/user_folder.xml
@@ -27,21 +27,26 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
- <GridView
- android:id="@id/folder_content"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
-
- android:cacheColorHint="#ff333333"
- android:background="@drawable/box_launcher_bottom"
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:background="@drawable/box_launcher_bottom">
- android:scrollbarAlwaysDrawVerticalTrack="true"
- android:scrollbarStyle="insideInset"
- android:drawSelectorOnTop="false"
- android:listSelector="@drawable/grid_selector"
+ <GridView
+ android:id="@id/folder_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
- android:verticalSpacing="10dip"
- android:numColumns="5" />
+ android:cacheColorHint="#ff333333"
+
+ android:scrollbarAlwaysDrawVerticalTrack="true"
+ android:scrollbarStyle="insideInset"
+ android:drawSelectorOnTop="false"
+ android:listSelector="@drawable/grid_selector"
+
+ android:verticalSpacing="10dip"
+ android:numColumns="5" />
+ </FrameLayout>
</com.android.launcher2.UserFolder>
diff --git a/res/layout-port/live_folder_grid.xml b/res/layout-port/live_folder_grid.xml
index 745307f..85f74db 100644
--- a/res/layout-port/live_folder_grid.xml
+++ b/res/layout-port/live_folder_grid.xml
@@ -30,21 +30,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
- <GridView
- android:id="@id/folder_content"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:background="@drawable/box_launcher_bottom">
+ <GridView
+ android:id="@id/folder_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
- android:cacheColorHint="#ff333333"
- android:background="@drawable/box_launcher_bottom"
+ android:cacheColorHint="#ff333333"
- android:scrollbarAlwaysDrawVerticalTrack="true"
- android:scrollbarStyle="insideInset"
- android:drawSelectorOnTop="false"
- android:listSelector="@drawable/grid_selector"
+ android:scrollbarAlwaysDrawVerticalTrack="true"
+ android:scrollbarStyle="insideInset"
+ android:drawSelectorOnTop="false"
+ android:listSelector="@drawable/grid_selector"
- android:verticalSpacing="10dip"
- android:numColumns="4" />
+ android:verticalSpacing="10dip"
+ android:numColumns="4" />
+ </FrameLayout>
</com.android.launcher2.LiveFolder>
diff --git a/res/layout-port/user_folder.xml b/res/layout-port/user_folder.xml
index 7377cde..0e6df66 100644
--- a/res/layout-port/user_folder.xml
+++ b/res/layout-port/user_folder.xml
@@ -27,21 +27,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
- <GridView
- android:id="@id/folder_content"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:background="@drawable/box_launcher_bottom">
+ <GridView
+ android:id="@id/folder_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
- android:cacheColorHint="#ff333333"
- android:background="@drawable/box_launcher_bottom"
+ android:cacheColorHint="#ff333333"
- android:scrollbarAlwaysDrawVerticalTrack="true"
- android:scrollbarStyle="insideInset"
- android:drawSelectorOnTop="false"
- android:listSelector="@drawable/grid_selector"
+ android:scrollbarAlwaysDrawVerticalTrack="true"
+ android:scrollbarStyle="insideInset"
+ android:drawSelectorOnTop="false"
+ android:listSelector="@drawable/grid_selector"
- android:verticalSpacing="10dip"
- android:numColumns="4" />
+ android:verticalSpacing="10dip"
+ android:numColumns="4" />
+ </FrameLayout>
</com.android.launcher2.UserFolder>
diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml
index e5a305f..0dc7b7c 100644
--- a/res/layout/live_folder_list.xml
+++ b/res/layout/live_folder_list.xml
@@ -21,22 +21,25 @@
android:orientation="vertical">
<Button
- android:id="@+id/folder_close"
- android:background="@drawable/box_launcher_top"
- android:gravity="left|center_vertical"
- android:textSize="14sp"
- android:textColor="#404040"
- android:textStyle="bold"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:id="@+id/folder_close"
+ android:background="@drawable/box_launcher_top"
+ android:gravity="left|center_vertical"
+ android:textSize="14sp"
+ android:textColor="#404040"
+ android:textStyle="bold"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
- <ListView
- android:id="@id/folder_content"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
-
- android:cacheColorHint="#ff333333"
- android:background="@drawable/box_launcher_bottom" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:background="@drawable/box_launcher_bottom">
+ <ListView
+ android:id="@id/folder_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:cacheColorHint="#ff333333" />
+ </FrameLayout>
</com.android.launcher2.LiveFolder>
