diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-12 02:53:22 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-18 15:16:00 +0200 |
commit | 5664de2524be15329882bf81925d08b5de760b8c (patch) | |
tree | 8c3df8adb88f3f2450e1bf51c9ab81a5626658e9 /res/layout | |
parent | 1697b79a86c8244cf2758eec93e0ba299bc107d0 (diff) | |
download | android_packages_apps_Trebuchet-5664de2524be15329882bf81925d08b5de760b8c.tar.gz android_packages_apps_Trebuchet-5664de2524be15329882bf81925d08b5de760b8c.tar.bz2 android_packages_apps_Trebuchet-5664de2524be15329882bf81925d08b5de760b8c.zip |
Update assets for pressed/focused/selected states
Also, add shadow below/above wallpaper strip
Bug: 10722070
Change-Id: I37c445bab90e103f414c95b62e101a73d060661f
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/wallpaper_cropper.xml | 2 | ||||
-rw-r--r-- | res/layout/wallpaper_picker.xml | 28 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_gallery_item.xml | 4 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_item.xml | 4 |
4 files changed, 26 insertions, 12 deletions
diff --git a/res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml index 768500c0a..3a3d98a69 100644 --- a/res/layout/wallpaper_cropper.xml +++ b/res/layout/wallpaper_cropper.xml @@ -19,7 +19,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/wallpaper_cropper" + android:id="@+id/wallpaper_root" android:layout_width="match_parent" android:layout_height="match_parent"> <com.android.launcher3.CropView diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml index 347a63e75..a0672f649 100644 --- a/res/layout/wallpaper_picker.xml +++ b/res/layout/wallpaper_picker.xml @@ -19,7 +19,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/wallpaper_picker" + android:id="@+id/wallpaper_root" android:layout_width="match_parent" android:layout_height="match_parent"> <com.android.launcher3.CropView @@ -36,14 +36,28 @@ android:indeterminate="true" android:indeterminateOnly="true" android:background="@android:color/transparent" /> - <HorizontalScrollView + <LinearLayout android:id="@+id/wallpaper_strip" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" > - <LinearLayout android:id="@+id/wallpaper_list" + android:layout_alignParentBottom="true" + android:orientation="vertical" + android:fitsSystemWindows="true" > + <View android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" /> - </HorizontalScrollView> + android:layout_height="2dp" + android:background="@drawable/tile_shadow_top" /> + <HorizontalScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" > + <LinearLayout android:id="@+id/wallpaper_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + </HorizontalScrollView> + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:background="@drawable/tile_shadow_bottom" /> + </LinearLayout> </RelativeLayout> diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_gallery_item.xml index ecfba600e..976d3faae 100644 --- a/res/layout/wallpaper_picker_gallery_item.xml +++ b/res/layout/wallpaper_picker_gallery_item.xml @@ -20,8 +20,8 @@ android:layout_height="@dimen/wallpaperThumbnailHeight" android:focusable="true" android:clickable="true" - android:background="@drawable/wallpaper_gallery_item" - android:foreground="@drawable/wallpaper_gallery_item"> + android:background="@drawable/wallpaper_tile_fg" + android:foreground="@drawable/wallpaper_tile_fg"> <ImageView android:id="@+id/wallpaper_image" android:layout_width="match_parent" diff --git a/res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml index 79d45c02d..0ac8f97fb 100644 --- a/res/layout/wallpaper_picker_item.xml +++ b/res/layout/wallpaper_picker_item.xml @@ -20,8 +20,8 @@ android:layout_height="@dimen/wallpaperThumbnailHeight" android:focusable="true" android:clickable="true" - android:background="@drawable/wallpaper_gallery_item" - android:foreground="@drawable/wallpaper_gallery_item"> + android:background="@drawable/wallpaper_tile_fg" + android:foreground="@drawable/wallpaper_tile_fg"> <ImageView android:id="@+id/wallpaper_image" android:layout_width="match_parent" |