From 8e963a5a6016d246184ed65906f9d103e92b17e2 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Tue, 6 Aug 2013 11:43:02 -0700
Subject: This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
---
 res/xml/camera_preferences.xml       |  2 +-
 res/xml/device_filter.xml            | 19 -------------------
 res/xml/video_preferences.xml        |  2 +-
 res/xml/wallpaper_picker_preview.xml | 19 -------------------
 res/xml/widget_info.xml              |  8 --------
 5 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 res/xml/device_filter.xml
 delete mode 100644 res/xml/wallpaper_picker_preview.xml
 delete mode 100644 res/xml/widget_info.xml

(limited to 'res/xml')

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 8c13a3422..b97840456 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceGroup
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.gallery3d"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera2"
         camera:title="@string/pref_camera_settings_category">
     <IconListPreference
             camera:key="pref_camera_flashmode_key"
diff --git a/res/xml/device_filter.xml b/res/xml/device_filter.xml
deleted file mode 100644
index 36cd13da7..000000000
--- a/res/xml/device_filter.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<resources>
-    <!-- filter for PTP devices -->
-    <usb-device class="6" subclass="1" protocol="1" />
-</resources>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 79154e653..ce36219f8 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceGroup
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.gallery3d"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera2"
         camera:title="@string/pref_camcorder_settings_category">
     <ListPreference
             camera:key="pref_video_quality_key"
diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml
deleted file mode 100644
index 759ff6fd4..000000000
--- a/res/xml/wallpaper_picker_preview.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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/widget_info.xml b/res/xml/widget_info.xml
deleted file mode 100644
index 4aa460f8d..000000000
--- a/res/xml/widget_info.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"/>
-- 
cgit v1.2.3