diff options
author | Michael Jurka <mikejurka@google.com> | 2013-12-11 15:41:28 +0100 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-12-11 15:41:28 +0100 |
commit | 96749c13218aa1b783709dc82a4e16657ce9753f (patch) | |
tree | 328761f12d078f62ac8d7b296bbf6f39f5657da2 /res/layout | |
parent | 1f60653abcc349127014e4f32232261dfc28b309 (diff) | |
download | android_packages_apps_Trebuchet-96749c13218aa1b783709dc82a4e16657ce9753f.tar.gz android_packages_apps_Trebuchet-96749c13218aa1b783709dc82a4e16657ce9753f.tar.bz2 android_packages_apps_Trebuchet-96749c13218aa1b783709dc82a4e16657ce9753f.zip |
Revert "Revert "Move wallpaper picker code to a separate directory""
This reverts commit 39de459a8621abfc91382ce7b4cdd37d09aaac12.
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/actionbar_set_wallpaper.xml | 34 | ||||
-rw-r--r-- | res/layout/wallpaper_cropper.xml | 39 | ||||
-rw-r--r-- | res/layout/wallpaper_picker.xml | 77 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_image_picker_item.xml | 42 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_item.xml | 30 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_live_wallpaper_item.xml | 49 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_third_party_item.xml | 40 |
7 files changed, 0 insertions, 311 deletions
diff --git a/res/layout/actionbar_set_wallpaper.xml b/res/layout/actionbar_set_wallpaper.xml deleted file mode 100644 index 1622742a5..000000000 --- a/res/layout/actionbar_set_wallpaper.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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_cropper.xml b/res/layout/wallpaper_cropper.xml deleted file mode 100644 index abb860898..000000000 --- a/res/layout/wallpaper_cropper.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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_root" - 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_centerInParent="true" - android:indeterminate="true" - android:indeterminateOnly="true" - android:background="@android:color/transparent" /> -</RelativeLayout> diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml deleted file mode 100644 index c36493d2f..000000000 --- a/res/layout/wallpaper_picker.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?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. -*/ ---> - -<com.android.launcher3.WallpaperRootView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/wallpaper_root" - 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_centerInParent="true" - android:indeterminate="true" - android:indeterminateOnly="true" - android:background="@android:color/transparent" /> - <LinearLayout - android:id="@+id/wallpaper_strip" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="vertical" > - <View - android:layout_width="match_parent" - android:layout_height="2dp" - android:background="@drawable/tile_shadow_top" /> - <HorizontalScrollView - android:id="@+id/wallpaper_scroll_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - <LinearLayout android:id="@+id/master_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 android:id="@+id/third_party_wallpaper_list" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" /> - </LinearLayout> - </HorizontalScrollView> - <View - android:layout_width="match_parent" - android:layout_height="2dp" - android:background="@drawable/tile_shadow_bottom" /> - </LinearLayout> -</com.android.launcher3.WallpaperRootView> diff --git a/res/layout/wallpaper_picker_image_picker_item.xml b/res/layout/wallpaper_picker_image_picker_item.xml deleted file mode 100644 index ae3c43d8e..000000000 --- a/res/layout/wallpaper_picker_image_picker_item.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?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:ellipsize="marquee" - android:gravity="center" - android:layout_gravity="center" - android:text="@string/pick_image" - android:drawableTop="@drawable/ic_images" - android:drawablePadding="4dp" - android:textColor="@android:color/white"/> -</com.android.launcher3.CheckableFrameLayout> diff --git a/res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml deleted file mode 100644 index 0ac8f97fb..000000000 --- a/res/layout/wallpaper_picker_item.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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:scaleType="centerCrop" /> -</com.android.launcher3.CheckableFrameLayout> diff --git a/res/layout/wallpaper_picker_live_wallpaper_item.xml b/res/layout/wallpaper_picker_live_wallpaper_item.xml deleted file mode 100644 index 29fdb1b82..000000000 --- a/res/layout/wallpaper_picker_live_wallpaper_item.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?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="@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" - android:background="@color/wallpaper_picker_translucent_gray" - android:textColor="@android:color/white"/> -</com.android.launcher3.CheckableFrameLayout> diff --git a/res/layout/wallpaper_picker_third_party_item.xml b/res/layout/wallpaper_picker_third_party_item.xml deleted file mode 100644 index 68661bc00..000000000 --- a/res/layout/wallpaper_picker_third_party_item.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?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:ellipsize="marquee" - android:gravity="center" - android:layout_gravity="center" - android:drawablePadding="4dp" - android:textColor="@android:color/white"/> -</com.android.launcher3.CheckableFrameLayout> |