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

Fix bug 3126193 - over-scroll glow extends beyond folder bounds

Browse Source 
Fixed a layout problem in Launcher2 where lists and grids did not have
proper containers.

Change-Id: I683e42362345a9c9d18d957e84bb8522675fdfc6
This commit is contained in:
Adam Powell
2010-11-08 17:00:18 -08:00
parent f68b229cb2
commit df99daa3bc
5 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout-land/live_folder_grid.xml
+19 -14
View File
@@ -30,21 +30,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<GridView <FrameLayout
android:id="@+id/folder_content" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="0dip"
android:layout_height="0dip" android:layout_weight="1"
android:layout_weight="1" android:background="@drawable/box_launcher_bottom">
android:cacheColorHint="#ff333333"
android:background="@drawable/box_launcher_bottom"
android:scrollbarAlwaysDrawVerticalTrack="true" <GridView
android:scrollbarStyle="insideInset" android:id="@+id/folder_content"
android:drawSelectorOnTop="false" android:layout_width="match_parent"
android:listSelector="@drawable/grid_selector" android:layout_height="match_parent"
android:verticalSpacing="10dip" android:cacheColorHint="#ff333333"
android:numColumns="5" />
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> </com.android.launcher2.LiveFolder>
res/layout-land/user_folder.xml
+19 -14
View File
@@ -27,21 +27,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<GridView <FrameLayout
android:id="@id/folder_content" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="0dip"
android:layout_height="0dip" android:layout_weight="1"
android:layout_weight="1" android:background="@drawable/box_launcher_bottom">
android:cacheColorHint="#ff333333"
android:background="@drawable/box_launcher_bottom"
android:scrollbarAlwaysDrawVerticalTrack="true" <GridView
android:scrollbarStyle="insideInset" android:id="@id/folder_content"
android:drawSelectorOnTop="false" android:layout_width="match_parent"
android:listSelector="@drawable/grid_selector" android:layout_height="match_parent"
android:verticalSpacing="10dip" android:cacheColorHint="#ff333333"
android:numColumns="5" />
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> </com.android.launcher2.UserFolder>
res/layout-port/live_folder_grid.xml
+17 -13
View File
@@ -30,21 +30,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<GridView <FrameLayout
android:id="@id/folder_content" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="0dip"
android:layout_height="0dip" android:layout_weight="1"
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:cacheColorHint="#ff333333"
android:background="@drawable/box_launcher_bottom"
android:scrollbarAlwaysDrawVerticalTrack="true" android:scrollbarAlwaysDrawVerticalTrack="true"
android:scrollbarStyle="insideInset" android:scrollbarStyle="insideInset"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:listSelector="@drawable/grid_selector" android:listSelector="@drawable/grid_selector"
android:verticalSpacing="10dip" android:verticalSpacing="10dip"
android:numColumns="4" /> android:numColumns="4" />
</FrameLayout>
</com.android.launcher2.LiveFolder> </com.android.launcher2.LiveFolder>
res/layout-port/user_folder.xml
+17 -13
View File
@@ -27,21 +27,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<GridView <FrameLayout
android:id="@id/folder_content" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="0dip"
android:layout_height="0dip" android:layout_weight="1"
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:cacheColorHint="#ff333333"
android:background="@drawable/box_launcher_bottom"
android:scrollbarAlwaysDrawVerticalTrack="true" android:scrollbarAlwaysDrawVerticalTrack="true"
android:scrollbarStyle="insideInset" android:scrollbarStyle="insideInset"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:listSelector="@drawable/grid_selector" android:listSelector="@drawable/grid_selector"
android:verticalSpacing="10dip" android:verticalSpacing="10dip"
android:numColumns="4" /> android:numColumns="4" />
</FrameLayout>
</com.android.launcher2.UserFolder> </com.android.launcher2.UserFolder>
res/layout/live_folder_list.xml
+19 -16
View File
@@ -21,22 +21,25 @@
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
android:id="@+id/folder_close" android:id="@+id/folder_close"
android:background="@drawable/box_launcher_top" android:background="@drawable/box_launcher_top"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:textSize="14sp" android:textSize="14sp"
android:textColor="#404040" android:textColor="#404040"
android:textStyle="bold" android:textStyle="bold"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ListView <FrameLayout
android:id="@id/folder_content" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="0dip"
android:layout_height="0dip" android:layout_weight="1"
android:layout_weight="1" android:background="@drawable/box_launcher_bottom">
<ListView
android:cacheColorHint="#ff333333" android:id="@id/folder_content"
android:background="@drawable/box_launcher_bottom" /> android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="#ff333333" />
</FrameLayout>
</com.android.launcher2.LiveFolder> </com.android.launcher2.LiveFolder>