summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-11-08 19:25:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-08 19:25:09 -0800
commitaff3e6e56de1f65923d67c2caf1f6027af50006e (patch)
tree23f0997213b5ac48ecb4c5146054edeb3d033059 /res/layout
parent94ba5b1b92a2e8bb32dd578f0f4ec1293c5bd16c (diff)
parent4dd45be8afa39c88781364933e819e8734732d17 (diff)
downloadandroid_packages_apps_Trebuchet-aff3e6e56de1f65923d67c2caf1f6027af50006e.tar.gz
android_packages_apps_Trebuchet-aff3e6e56de1f65923d67c2caf1f6027af50006e.tar.bz2
android_packages_apps_Trebuchet-aff3e6e56de1f65923d67c2caf1f6027af50006e.zip
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
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/live_folder_list.xml35
1 files changed, 19 insertions, 16 deletions
diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml
index e5a305f41..0dc7b7c24 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>