diff options
| author | Winson Chung <winsonc@google.com> | 2011-02-24 18:09:44 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-02-25 13:48:14 -0800 |
| commit | 1908d07151e0d3f82899f368874e41ed1e49ba16 (patch) | |
| tree | 3fb2446187a953e3204d66948640ea4762490fce /res/layout-xlarge | |
| parent | f4204b8c1ab1ccfc99ed3bc9a0e113f6722769cc (diff) | |
| download | android_packages_apps_Trebuchet-1908d07151e0d3f82899f368874e41ed1e49ba16.tar.gz android_packages_apps_Trebuchet-1908d07151e0d3f82899f368874e41ed1e49ba16.tar.bz2 android_packages_apps_Trebuchet-1908d07151e0d3f82899f368874e41ed1e49ba16.zip | |
Refactoring and fixing bugs in Customize tray.
Change-Id: Ia37d3033d64036fd09f5f33443eb9f575e311c7c
Diffstat (limited to 'res/layout-xlarge')
| -rw-r--r-- | res/layout-xlarge/customize_paged_view_wallpaper.xml | 14 | ||||
| -rw-r--r-- | res/layout-xlarge/customize_paged_view_widget.xml | 16 | ||||
| -rw-r--r-- | res/layout-xlarge/launcher.xml | 2 |
3 files changed, 18 insertions, 14 deletions
diff --git a/res/layout-xlarge/customize_paged_view_wallpaper.xml b/res/layout-xlarge/customize_paged_view_wallpaper.xml index e3be86d87..8c5abc8d9 100644 --- a/res/layout-xlarge/customize_paged_view_wallpaper.xml +++ b/res/layout-xlarge/customize_paged_view_wallpaper.xml @@ -18,12 +18,11 @@ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:layout_width="wrap_content" - android:layout_height="365dp" - android:paddingLeft="12.5dp" - android:paddingRight="12.5dp" - android:paddingBottom="50dp" - android:gravity="top" + android:layout_height="match_parent" + android:layout_weight="1" android:orientation="vertical" + android:paddingRight="25dp" + android:paddingBottom="50dp" launcher:blurColor="#FF6B8CF0" launcher:outlineColor="#FF8CD2FF"> @@ -33,7 +32,8 @@ android:id="@+id/wallpaper_preview" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1.0" + android:layout_weight="1" + android:adjustViewBounds="true" android:scaleType="fitStart" /> <!-- The divider image. --> @@ -41,6 +41,7 @@ android:id="@+id/divider" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:paddingTop="10dp" android:paddingBottom="10dp" android:src="@drawable/widget_divider" /> @@ -50,6 +51,7 @@ android:id="@+id/wallpaper_name" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:gravity="left" android:textColor="#FFFFFFFF" diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml index 3b95ebc66..c0b455251 100644 --- a/res/layout-xlarge/customize_paged_view_widget.xml +++ b/res/layout-xlarge/customize_paged_view_widget.xml @@ -18,13 +18,11 @@ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:layout_width="wrap_content" - android:layout_height="365dp" - android:paddingLeft="12.5dp" - android:paddingTop="12.5dp" - android:paddingRight="12.5dp" - android:paddingBottom="50dp" - android:gravity="top" + android:layout_height="match_parent" + android:layout_weight="1" android:orientation="vertical" + android:paddingRight="25dp" + android:paddingBottom="50dp" launcher:blurColor="#FF6B8CF0" launcher:outlineColor="#FF8CD2FF"> @@ -34,7 +32,8 @@ android:id="@+id/widget_preview" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1.0" + android:layout_weight="1" + android:adjustViewBounds="true" android:scaleType="fitStart" /> <!-- The divider image. --> @@ -42,6 +41,7 @@ android:id="@+id/divider" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:paddingTop="10dp" android:paddingBottom="10dp" android:src="@drawable/widget_divider" /> @@ -51,6 +51,7 @@ android:id="@+id/widget_name" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:gravity="left" android:textColor="#FFFFFFFF" @@ -69,6 +70,7 @@ android:id="@+id/widget_dims" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:gravity="left" android:textColor="#FF999999" diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml index 7f2b8e169..a7cf3214c 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -205,7 +205,7 @@ <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="@dimen/customization_drawer_content_height"> </FrameLayout> </LinearLayout> </TabHost> |