diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-18 16:04:36 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-20 01:12:53 +0200 |
commit | 998e4ff3dca60d65e94fa2ec4a35cb258124318b (patch) | |
tree | faacde95f38543cda8b7223c41bf8db6fafe08ab /res/layout | |
parent | 437dec39ee89ba6817967ae5bd75d663eecad5db (diff) | |
download | android_packages_apps_Trebuchet-998e4ff3dca60d65e94fa2ec4a35cb258124318b.tar.gz android_packages_apps_Trebuchet-998e4ff3dca60d65e94fa2ec4a35cb258124318b.tar.bz2 android_packages_apps_Trebuchet-998e4ff3dca60d65e94fa2ec4a35cb258124318b.zip |
Add live wallpapers and third-party pickers to bottom strip
Bug: 10742727
Bug: 10805463
Change-Id: I961344b34fff3b183380caf3508d23b05c1ca26c
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/live_wallpaper_picker_item.xml | 47 | ||||
-rw-r--r-- | res/layout/third_party_wallpaper_picker_item.xml | 38 | ||||
-rw-r--r-- | res/layout/wallpaper_picker.xml | 19 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_gallery_item.xml | 4 |
4 files changed, 103 insertions, 5 deletions
diff --git a/res/layout/live_wallpaper_picker_item.xml b/res/layout/live_wallpaper_picker_item.xml new file mode 100644 index 000000000..29aa12ca2 --- /dev/null +++ b/res/layout/live_wallpaper_picker_item.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.android.launcher3.CheckableFrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/wallpaperThumbnailWidth" + android:layout_height="@dimen/wallpaperThumbnailHeight" + android:focusable="true" + android:clickable="true" + android:background="@drawable/wallpaper_tile_fg" + android:foreground="@drawable/wallpaper_tile_fg"> + <ImageView + android:id="@+id/wallpaper_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:background="@android:color/black" + android:scaleType="centerCrop" /> + <ImageView + android:id="@+id/wallpaper_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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:gravity="center" + android:padding="4dp" + android:layout_gravity="bottom" + android:background="@color/wallpaper_picker_translucent_gray" + android:textColor="@android:color/white"/> +</com.android.launcher3.CheckableFrameLayout> diff --git a/res/layout/third_party_wallpaper_picker_item.xml b/res/layout/third_party_wallpaper_picker_item.xml new file mode 100644 index 000000000..c2aeade9e --- /dev/null +++ b/res/layout/third_party_wallpaper_picker_item.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.android.launcher3.CheckableFrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/wallpaperThumbnailWidth" + android:layout_height="@dimen/wallpaperThumbnailHeight" + android:focusable="true" + android:clickable="true" + android:background="@drawable/wallpaper_tile_fg" + android:foreground="@drawable/wallpaper_tile_fg"> + <ImageView + android:id="@+id/wallpaper_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/wallpaper_picker_translucent_gray" + android:scaleType="centerCrop" /> + <TextView + android:id="@+id/wallpaper_item_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:drawablePadding="4dp" + android:textColor="@android:color/white"/> +</com.android.launcher3.CheckableFrameLayout> diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml index a0672f649..53c529c2a 100644 --- a/res/layout/wallpaper_picker.xml +++ b/res/layout/wallpaper_picker.xml @@ -50,10 +50,23 @@ <HorizontalScrollView android:layout_width="match_parent" android:layout_height="wrap_content" > - <LinearLayout android:id="@+id/wallpaper_list" - android:layout_width="match_parent" + <LinearLayout android:id="@+id/master_wallpaper_list" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" /> + android:orientation="horizontal" > + <LinearLayout android:id="@+id/third_party_wallpaper_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + <LinearLayout android:id="@+id/wallpaper_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + <LinearLayout android:id="@+id/live_wallpaper_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + </LinearLayout> </HorizontalScrollView> <View android:layout_width="match_parent" diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_gallery_item.xml index 976d3faae..d14ab3e5f 100644 --- a/res/layout/wallpaper_picker_gallery_item.xml +++ b/res/layout/wallpaper_picker_gallery_item.xml @@ -26,7 +26,7 @@ android:id="@+id/wallpaper_image" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#66000000" + android:background="@color/wallpaper_picker_translucent_gray" android:scaleType="centerCrop" /> <TextView android:id="@+id/wallpaper_item_label" @@ -36,5 +36,5 @@ android:text="@string/pick_image" android:drawableTop="@drawable/ic_images" android:drawablePadding="4dp" - android:textColor="#FFFFFFFF"/> + android:textColor="@android:color/white"/> </com.android.launcher3.CheckableFrameLayout> |