am df99daa3: Fix bug 3126193 - over-scroll glow extends beyond folder bounds

* commit 'df99daa3bce2c8ecbea6f5d091c090834b8e2089':
  Fix bug 3126193 - over-scroll glow extends beyond folder bounds
This commit is contained in:
Adam Powell
2010-11-08 17:25:17 -08:00
committed by Android Git Automerger
5 changed files with 91 additions and 70 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>