Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into gb-ub-photos-arches

4 files changed, 4 insertions, 42 deletions

diff --git a/res/xml-v11/wallpaper_picker_preview.xml b/res/xml-v11/wallpaper_picker_preview.xml
deleted file mode 100644
index d1ebf67ec..000000000
--- a/res/xml-v11/wallpaper_picker_preview.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<wallpaper-preview xmlns:android="http://schemas.android.com/apk/res/android"
-    android:staticWallpaperPreview="@drawable/wallpaper_picker_preview">
-</wallpaper-preview>
diff --git a/res/xml-v11/widget_info.xml b/res/xml-v11/widget_info.xml
deleted file mode 100644
index 2ade4f27e..000000000
--- a/res/xml-v11/widget_info.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-        android:minWidth="@dimen/appwidget_width"
-        android:minHeight="@dimen/appwidget_height"
-        android:updatePeriodMillis="86400000"
-        android:previewImage="@drawable/preview"
-        android:initialLayout="@layout/appwidget_main"
-        android:configure="com.android.gallery3d.gadget.WidgetConfigure"/>
diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml
index b9570776c..759ff6fd4 100644
--- a/res/xml/wallpaper_picker_preview.xml
+++ b/res/xml/wallpaper_picker_preview.xml
@@ -14,4 +14,6 @@
      limitations under the License.
 -->
 
-<wallpaper-preview xmlns:android="http://schemas.android.com/apk/res/android" />
+<wallpaper-preview xmlns:android="http://schemas.android.com/apk/res/android"
+    android:staticWallpaperPreview="@drawable/wallpaper_picker_preview">
+</wallpaper-preview>
diff --git a/res/xml/widget_info.xml b/res/xml/widget_info.xml
index 13c947874..4aa460f8d 100644
--- a/res/xml/widget_info.xml
+++ b/res/xml/widget_info.xml
@@ -3,5 +3,6 @@
         android:minWidth="@dimen/appwidget_width"
         android:minHeight="@dimen/appwidget_height"
         android:updatePeriodMillis="86400000"
+        android:previewImage="@drawable/preview"
         android:initialLayout="@layout/appwidget_main"
         android:configure="com.android.gallery3d.gadget.WidgetConfigure"/>