diff options
| author | Adam Powell <adamp@google.com> | 2010-11-08 17:00:18 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-11-08 17:02:48 -0800 |
| commit | df99daa3bce2c8ecbea6f5d091c090834b8e2089 (patch) | |
| tree | c39842c794aea30f85a15390753c3d6f9eace27e /res/layout-land | |
| parent | f68b229cb2e4c249ae29e652d16a095be44642c0 (diff) | |
| download | android_packages_apps_Trebuchet-df99daa3bce2c8ecbea6f5d091c090834b8e2089.tar.gz android_packages_apps_Trebuchet-df99daa3bce2c8ecbea6f5d091c090834b8e2089.tar.bz2 android_packages_apps_Trebuchet-df99daa3bce2c8ecbea6f5d091c090834b8e2089.zip | |
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
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/live_folder_grid.xml | 33 | ||||
| -rw-r--r-- | res/layout-land/user_folder.xml | 37 |
2 files changed, 40 insertions, 30 deletions
diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml index 44519d484..17967563d 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"> + + <GridView + android:id="@+id/folder_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + + 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="5" /> + 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 b05974ae7..5da4aa57e 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" - - android:scrollbarAlwaysDrawVerticalTrack="true" - android:scrollbarStyle="insideInset" - android:drawSelectorOnTop="false" - android:listSelector="@drawable/grid_selector" - - android:verticalSpacing="10dip" - android:numColumns="5" /> + <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:scrollbarAlwaysDrawVerticalTrack="true" + android:scrollbarStyle="insideInset" + android:drawSelectorOnTop="false" + android:listSelector="@drawable/grid_selector" + + android:verticalSpacing="10dip" + android:numColumns="5" /> + </FrameLayout> </com.android.launcher2.UserFolder> |