diff options
author | Michael Jurka <mikejurka@google.com> | 2013-07-08 18:03:46 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-08-21 13:18:29 +0200 |
commit | 104c45677660586026a7e74ef8c47d396403d50e (patch) | |
tree | f9a2a66390820d69963ec626990d4bc0e58a7c02 /res | |
parent | 912d360cd7350d8fe959202c6b5d0a5aa97790aa (diff) | |
download | android_packages_apps_Trebuchet-104c45677660586026a7e74ef8c47d396403d50e.tar.gz android_packages_apps_Trebuchet-104c45677660586026a7e74ef8c47d396403d50e.tar.bz2 android_packages_apps_Trebuchet-104c45677660586026a7e74ef8c47d396403d50e.zip |
Initial implementation of new wallpaper picker.
Change-Id: Ib4c5ac4989b4959fa62465d9cde3cac662e24949
Diffstat (limited to 'res')
39 files changed, 198 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_actionbar_accept.png b/res/drawable-hdpi/ic_actionbar_accept.png Binary files differnew file mode 100755 index 000000000..53cf6877e --- /dev/null +++ b/res/drawable-hdpi/ic_actionbar_accept.png diff --git a/res/drawable-mdpi/ic_actionbar_accept.png b/res/drawable-mdpi/ic_actionbar_accept.png Binary files differnew file mode 100755 index 000000000..35cda8e11 --- /dev/null +++ b/res/drawable-mdpi/ic_actionbar_accept.png diff --git a/res/drawable-nodpi/wallpaper_01.jpg b/res/drawable-nodpi/wallpaper_01.jpg Binary files differnew file mode 100644 index 000000000..1a07f2e9e --- /dev/null +++ b/res/drawable-nodpi/wallpaper_01.jpg diff --git a/res/drawable-nodpi/wallpaper_01_small.jpg b/res/drawable-nodpi/wallpaper_01_small.jpg Binary files differnew file mode 100644 index 000000000..8965ee52c --- /dev/null +++ b/res/drawable-nodpi/wallpaper_01_small.jpg diff --git a/res/drawable-nodpi/wallpaper_02.jpg b/res/drawable-nodpi/wallpaper_02.jpg Binary files differnew file mode 100644 index 000000000..3d10150b6 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_02.jpg diff --git a/res/drawable-nodpi/wallpaper_02_small.jpg b/res/drawable-nodpi/wallpaper_02_small.jpg Binary files differnew file mode 100644 index 000000000..2160b5e90 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_02_small.jpg diff --git a/res/drawable-nodpi/wallpaper_03.jpg b/res/drawable-nodpi/wallpaper_03.jpg Binary files differnew file mode 100644 index 000000000..f29376f7d --- /dev/null +++ b/res/drawable-nodpi/wallpaper_03.jpg diff --git a/res/drawable-nodpi/wallpaper_03_small.jpg b/res/drawable-nodpi/wallpaper_03_small.jpg Binary files differnew file mode 100644 index 000000000..38ee82c6f --- /dev/null +++ b/res/drawable-nodpi/wallpaper_03_small.jpg diff --git a/res/drawable-nodpi/wallpaper_04.jpg b/res/drawable-nodpi/wallpaper_04.jpg Binary files differnew file mode 100644 index 000000000..254daf002 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_04.jpg diff --git a/res/drawable-nodpi/wallpaper_04_small.jpg b/res/drawable-nodpi/wallpaper_04_small.jpg Binary files differnew file mode 100644 index 000000000..bf6471cb3 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_04_small.jpg diff --git a/res/drawable-nodpi/wallpaper_05.jpg b/res/drawable-nodpi/wallpaper_05.jpg Binary files differnew file mode 100644 index 000000000..9751dc418 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_05.jpg diff --git a/res/drawable-nodpi/wallpaper_05_small.jpg b/res/drawable-nodpi/wallpaper_05_small.jpg Binary files differnew file mode 100644 index 000000000..5cfe680c8 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_05_small.jpg diff --git a/res/drawable-nodpi/wallpaper_06.jpg b/res/drawable-nodpi/wallpaper_06.jpg Binary files differnew file mode 100644 index 000000000..6f2812db7 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_06.jpg diff --git a/res/drawable-nodpi/wallpaper_06_small.jpg b/res/drawable-nodpi/wallpaper_06_small.jpg Binary files differnew file mode 100644 index 000000000..6ff225470 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_06_small.jpg diff --git a/res/drawable-nodpi/wallpaper_07.jpg b/res/drawable-nodpi/wallpaper_07.jpg Binary files differnew file mode 100644 index 000000000..dc01b2278 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_07.jpg diff --git a/res/drawable-nodpi/wallpaper_07_small.jpg b/res/drawable-nodpi/wallpaper_07_small.jpg Binary files differnew file mode 100644 index 000000000..9a327526c --- /dev/null +++ b/res/drawable-nodpi/wallpaper_07_small.jpg diff --git a/res/drawable-nodpi/wallpaper_08.jpg b/res/drawable-nodpi/wallpaper_08.jpg Binary files differnew file mode 100644 index 000000000..e142ca054 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_08.jpg diff --git a/res/drawable-nodpi/wallpaper_08_small.jpg b/res/drawable-nodpi/wallpaper_08_small.jpg Binary files differnew file mode 100644 index 000000000..76c3f7f95 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_08_small.jpg diff --git a/res/drawable-nodpi/wallpaper_09.jpg b/res/drawable-nodpi/wallpaper_09.jpg Binary files differnew file mode 100644 index 000000000..177173910 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_09.jpg diff --git a/res/drawable-nodpi/wallpaper_09_small.jpg b/res/drawable-nodpi/wallpaper_09_small.jpg Binary files differnew file mode 100644 index 000000000..da3fbf7da --- /dev/null +++ b/res/drawable-nodpi/wallpaper_09_small.jpg diff --git a/res/drawable-nodpi/wallpaper_10.jpg b/res/drawable-nodpi/wallpaper_10.jpg Binary files differnew file mode 100644 index 000000000..4d9815a7b --- /dev/null +++ b/res/drawable-nodpi/wallpaper_10.jpg diff --git a/res/drawable-nodpi/wallpaper_10_small.jpg b/res/drawable-nodpi/wallpaper_10_small.jpg Binary files differnew file mode 100644 index 000000000..c33eafaec --- /dev/null +++ b/res/drawable-nodpi/wallpaper_10_small.jpg diff --git a/res/drawable-nodpi/wallpaper_11.jpg b/res/drawable-nodpi/wallpaper_11.jpg Binary files differnew file mode 100644 index 000000000..46a4aa39d --- /dev/null +++ b/res/drawable-nodpi/wallpaper_11.jpg diff --git a/res/drawable-nodpi/wallpaper_11_small.jpg b/res/drawable-nodpi/wallpaper_11_small.jpg Binary files differnew file mode 100644 index 000000000..5107c0c03 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_11_small.jpg diff --git a/res/drawable-nodpi/wallpaper_12.jpg b/res/drawable-nodpi/wallpaper_12.jpg Binary files differnew file mode 100644 index 000000000..d1257ce46 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_12.jpg diff --git a/res/drawable-nodpi/wallpaper_12_small.jpg b/res/drawable-nodpi/wallpaper_12_small.jpg Binary files differnew file mode 100644 index 000000000..1ca48ad49 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_12_small.jpg diff --git a/res/drawable-nodpi/wallpaper_13.jpg b/res/drawable-nodpi/wallpaper_13.jpg Binary files differnew file mode 100644 index 000000000..c668b6d57 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_13.jpg diff --git a/res/drawable-nodpi/wallpaper_13_small.jpg b/res/drawable-nodpi/wallpaper_13_small.jpg Binary files differnew file mode 100644 index 000000000..fedae8a3d --- /dev/null +++ b/res/drawable-nodpi/wallpaper_13_small.jpg diff --git a/res/drawable-nodpi/wallpaper_14.jpg b/res/drawable-nodpi/wallpaper_14.jpg Binary files differnew file mode 100644 index 000000000..5a8e00429 --- /dev/null +++ b/res/drawable-nodpi/wallpaper_14.jpg diff --git a/res/drawable-nodpi/wallpaper_14_small.jpg b/res/drawable-nodpi/wallpaper_14_small.jpg Binary files differnew file mode 100644 index 000000000..0ac47252e --- /dev/null +++ b/res/drawable-nodpi/wallpaper_14_small.jpg diff --git a/res/drawable-xhdpi/ic_actionbar_accept.png b/res/drawable-xhdpi/ic_actionbar_accept.png Binary files differnew file mode 100755 index 000000000..b52dc3701 --- /dev/null +++ b/res/drawable-xhdpi/ic_actionbar_accept.png diff --git a/res/layout/actionbar_set_wallpaper.xml b/res/layout/actionbar_set_wallpaper.xml new file mode 100644 index 000000000..1622742a5 --- /dev/null +++ b/res/layout/actionbar_set_wallpaper.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="?android:actionButtonStyle" + android:layout_width="match_parent" + android:layout_height="match_parent" > + <TextView style="?android:actionBarTabTextStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingRight="20dp" + android:drawableLeft="@drawable/ic_actionbar_accept" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/wallpaper_instructions" /> +</FrameLayout> diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml new file mode 100644 index 000000000..493606da5 --- /dev/null +++ b/res/layout/wallpaper_picker.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/wallpaper_picker" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.launcher3.CropView + android:id="@+id/cropView" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <ProgressBar + android:id="@+id/loading" + style="@android:style/Widget.Holo.ProgressBar.Large" + android:visibility="invisible" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:background="@android:color/transparent" /> + <HorizontalScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" > + <LinearLayout android:id="@+id/wallpaper_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + </HorizontalScrollView> +</RelativeLayout> diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_gallery_item.xml new file mode 100644 index 000000000..b42b98afb --- /dev/null +++ b/res/layout/wallpaper_picker_gallery_item.xml @@ -0,0 +1,36 @@ +<?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. +--> + +<FrameLayout 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_gallery_item" + android:foreground="@drawable/wallpaper_gallery_item"> + <ImageView + android:id="@+id/wallpaper_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#66000000" + android:scaleType="fitXY" /> + <TextView + android:id="@+id/wallpaper_item_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textColor="#FFFFFFFF"/> +</FrameLayout> diff --git a/res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml new file mode 100644 index 000000000..a1f986518 --- /dev/null +++ b/res/layout/wallpaper_picker_item.xml @@ -0,0 +1,29 @@ +<?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. +--> + +<FrameLayout 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_gallery_item" + android:foreground="@drawable/wallpaper_gallery_item"> + <ImageView + android:id="@+id/wallpaper_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="fitXY" /> +</FrameLayout> diff --git a/res/values-nodpi/wallpapers.xml b/res/values-nodpi/wallpapers.xml new file mode 100644 index 000000000..97c567f59 --- /dev/null +++ b/res/values-nodpi/wallpapers.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (C) 2009 Google Inc. + * + * 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. + --> + +<resources> + <string-array name="wallpapers" translatable="false"> + <item>wallpaper_01</item> + <item>wallpaper_02</item> + <item>wallpaper_03</item> + <item>wallpaper_04</item> + <item>wallpaper_05</item> + <item>wallpaper_06</item> + <item>wallpaper_07</item> + <item>wallpaper_08</item> + <item>wallpaper_09</item> + <item>wallpaper_10</item> + <item>wallpaper_11</item> + <item>wallpaper_12</item> + <item>wallpaper_13</item> + <item>wallpaper_14</item> + </string-array> +</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 6e2448147..e557c3e35 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -21,6 +21,10 @@ <dimen name="dynamic_grid_search_bar_height">48dp</dimen> <dimen name="dynamic_grid_page_indicator_height">24dp</dimen> +<!-- Wallpaper picker --> + <dimen name="wallpaperThumbnailWidth">106.5dp</dimen> + <dimen name="wallpaperThumbnailHeight">94.5dp</dimen> + <!-- Cling --> <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen> <dimen name="folderClingMarginTop">20dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 51da40be5..7b97889ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -30,8 +30,10 @@ <string name="folder_name"></string> <!-- Title of dialog that appears after user selects Wallpaper from menu --> <string name="chooser_wallpaper">Choose wallpaper from</string> - <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper --> + <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper --> <string name="wallpaper_instructions">Set wallpaper</string> + <!-- Label on button in Wallpaper Picker that launches Gallery app --> + <string name="gallery">Gallery</string> <!-- Option in "Select wallpaper from" dialog box --> <string name="pick_wallpaper">Wallpapers</string> <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]--> diff --git a/res/values/styles.xml b/res/values/styles.xml index 9f5ade487..f41c8eba8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,7 +18,15 @@ --> <resources> - <style name="Theme.WallpaperPicker" parent="@android:style/Theme.Holo.NoActionBar"> + <style name="Theme.WallpaperPicker" parent="@android:style/Theme.Holo"> + <item name="android:actionBarStyle">@style/WallpaperPickerActionBar</item> + <item name="android:windowFullscreen">true</item> + <item name="android:windowActionBarOverlay">true</item> + </style> + + <style name="WallpaperPickerActionBar" parent="android:style/Widget.Holo.ActionBar"> + <item name="android:displayOptions">showCustom</item> + <item name="android:background">#88000000</item> </style> <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar"> |