diff options
author | Michael Jurka <mikejurka@google.com> | 2013-10-03 18:15:08 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-10-03 18:15:08 -0700 |
commit | 5b4b6904ae4d7706ff4c523018787320bc874333 (patch) | |
tree | 50a5e0f33b05193773a20e106904a5289c09b895 /res | |
parent | ed60ba1e24512bef0bb2b749b6297e8c7e5330cf (diff) | |
download | android_packages_apps_Trebuchet-5b4b6904ae4d7706ff4c523018787320bc874333.tar.gz android_packages_apps_Trebuchet-5b4b6904ae4d7706ff4c523018787320bc874333.tar.bz2 android_packages_apps_Trebuchet-5b4b6904ae4d7706ff4c523018787320bc874333.zip |
Finalize visuals of wallpaper picker items
Also, move third-party wallpapers to end of list
Bug: 10852962
Bug: 11024560
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/wallpaper_picker.xml | 6 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_image_picker_item.xml (renamed from res/layout/wallpaper_picker_gallery_item.xml) | 2 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_live_wallpaper_item.xml (renamed from res/layout/live_wallpaper_picker_item.xml) | 6 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_third_party_item.xml (renamed from res/layout/third_party_wallpaper_picker_item.xml) | 2 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
5 files changed, 12 insertions, 5 deletions
diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml index fd66a57be..c91cc7e6a 100644 --- a/res/layout/wallpaper_picker.xml +++ b/res/layout/wallpaper_picker.xml @@ -55,15 +55,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" > - <LinearLayout android:id="@+id/third_party_wallpaper_list" + <LinearLayout android:id="@+id/wallpaper_list" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" /> - <LinearLayout android:id="@+id/wallpaper_list" + <LinearLayout android:id="@+id/live_wallpaper_list" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" /> - <LinearLayout android:id="@+id/live_wallpaper_list" + <LinearLayout android:id="@+id/third_party_wallpaper_list" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" /> diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_image_picker_item.xml index d14ab3e5f..ae3c43d8e 100644 --- a/res/layout/wallpaper_picker_gallery_item.xml +++ b/res/layout/wallpaper_picker_image_picker_item.xml @@ -32,6 +32,8 @@ android:id="@+id/wallpaper_item_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="center" android:layout_gravity="center" android:text="@string/pick_image" android:drawableTop="@drawable/ic_images" diff --git a/res/layout/live_wallpaper_picker_item.xml b/res/layout/wallpaper_picker_live_wallpaper_item.xml index 29aa12ca2..29fdb1b82 100644 --- a/res/layout/live_wallpaper_picker_item.xml +++ b/res/layout/wallpaper_picker_live_wallpaper_item.xml @@ -31,14 +31,16 @@ android:scaleType="centerCrop" /> <ImageView android:id="@+id/wallpaper_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="@dimen/wallpaperItemIconSize" + android:layout_height="@dimen/wallpaperItemIconSize" android:layout_gravity="center" android:visibility="gone" /> <TextView android:id="@+id/wallpaper_item_label" android:layout_width="match_parent" android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" android:gravity="center" android:padding="4dp" android:layout_gravity="bottom" diff --git a/res/layout/third_party_wallpaper_picker_item.xml b/res/layout/wallpaper_picker_third_party_item.xml index c2aeade9e..68661bc00 100644 --- a/res/layout/third_party_wallpaper_picker_item.xml +++ b/res/layout/wallpaper_picker_third_party_item.xml @@ -32,6 +32,8 @@ android:id="@+id/wallpaper_item_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="center" android:layout_gravity="center" android:drawablePadding="4dp" android:textColor="@android:color/white"/> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2910b7c7c..b4b2367c7 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -24,6 +24,7 @@ <!-- Wallpaper picker --> <dimen name="wallpaperThumbnailWidth">106.5dp</dimen> <dimen name="wallpaperThumbnailHeight">94.5dp</dimen> + <dimen name="wallpaperItemIconSize">32dp</dimen> <!-- Cling --> <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen> |