diff options
| author | Adam Powell <adamp@google.com> | 2010-11-08 19:25:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-08 19:25:09 -0800 |
| commit | aff3e6e56de1f65923d67c2caf1f6027af50006e (patch) | |
| tree | 23f0997213b5ac48ecb4c5146054edeb3d033059 | |
| parent | 94ba5b1b92a2e8bb32dd578f0f4ec1293c5bd16c (diff) | |
| parent | 4dd45be8afa39c88781364933e819e8734732d17 (diff) | |
| download | packages_apps_trebuchet-aff3e6e56de1f65923d67c2caf1f6027af50006e.zip packages_apps_trebuchet-aff3e6e56de1f65923d67c2caf1f6027af50006e.tar.gz packages_apps_trebuchet-aff3e6e56de1f65923d67c2caf1f6027af50006e.tar.bz2 | |
am 4dd45be8: am df99daa3: Fix bug 3126193 - over-scroll glow extends beyond folder bounds
* commit '4dd45be8afa39c88781364933e819e8734732d17':
Fix bug 3126193 - over-scroll glow extends beyond folder bounds
| -rw-r--r-- | res/layout-land/live_folder_grid.xml | 33 | ||||
| -rw-r--r-- | res/layout-land/user_folder.xml | 37 | ||||
| -rw-r--r-- | res/layout-port/live_folder_grid.xml | 30 | ||||
| -rw-r--r-- | res/layout-port/user_folder.xml | 30 | ||||
| -rw-r--r-- | res/layout/live_folder_list.xml | 35 |
5 files changed, 93 insertions, 72 deletions
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"> + + <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 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" - - 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> 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> |