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

1 files changed, 55 insertions, 360 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef1d91459..57209ee90 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,16 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.camera2"
+    android:versionCode="1"
+    android:versionName="2.0" >
 
-<manifest android:versionCode="40030"
-        android:versionName="1.1.40030"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.gallery3d">
-
-    <original-package android:name="com.android.gallery3d" />
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
-
-    <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
-            android:protectionLevel="signatureOrSystem" />
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="17" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -30,380 +25,80 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
-
-    <supports-screens android:smallScreens="false"
-            android:normalScreens="true" android:largeScreens="true"
-            android:anyDensity="true" />
 
-    <application android:icon="@mipmap/ic_launcher_gallery" android:label="@string/app_name"
-            android:name="com.android.gallery3d.app.GalleryAppImpl"
-            android:theme="@style/Theme.Gallery"
-            android:logo="@mipmap/ic_launcher_gallery"
-            android:hardwareAccelerated="true"
-            android:largeHeap="true"
-            android:backupAgent="com.android.camera.CameraBackupAgent"
-            android:restoreAnyVersion="true">
-        <uses-library android:name="com.google.android.media.effects" android:required="false" />
-        <meta-data android:name="com.google.android.backup.api_key"
-                android:value="AEdPqrEAAAAIRIXquXawbz6duuuCIUAZ_YJv1zbFMMcjZ0NoVw" />
-        <activity android:name="com.android.gallery3d.app.MovieActivity"
-                android:label="@string/movie_view_label"
-                android:configChanges="orientation|keyboardHidden|screenSize">
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="false" />
+
+    <application
+        android:name="com.android.camera.app.CameraApp"
+        android:backupAgent="com.android.camera.CameraBackupAgent"
+        android:hardwareAccelerated="true"
+        android:icon="@mipmap/ic_launcher_camera"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:logo="@mipmap/ic_launcher_camera"
+        android:restoreAnyVersion="true"
+        android:theme="@style/Theme.Camera" >
+        <activity
+            android:name="com.android.camera.CameraActivity"
+            android:clearTaskOnLaunch="true"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:icon="@mipmap/ic_launcher_camera"
+            android:label="@string/camera_2"
+            android:taskAffinity="com.android.camera.CameraActivity"
+            android:theme="@style/Theme.Camera"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="rtsp" />
-             </intent-filter>
-             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:mimeType="video/mpeg4" />
-                <data android:mimeType="video/mp4" />
-                <data android:mimeType="video/3gp" />
-                <data android:mimeType="video/3gpp" />
-                <data android:mimeType="video/3gpp2" />
-                <data android:mimeType="video/webm" />
-                <data android:mimeType="video/avi" />
-                <data android:mimeType="application/sdp" />
-             </intent-filter>
-             <intent-filter>
-                <!-- HTTP live support -->
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:mimeType="audio/x-mpegurl" />
-                <data android:mimeType="audio/mpegurl" />
-                <data android:mimeType="application/vnd.apple.mpegurl" />
-                <data android:mimeType="application/x-mpegurl" />
-             </intent-filter>
-        </activity>
+                <action android:name="android.media.action.IMAGE_CAPTURE" />
 
-        <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name"
-                android:configChanges="keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.APP_GALLERY" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.OPENABLE" />
-                <data android:mimeType="vnd.android.cursor.dir/image" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.OPENABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-            <!-- We do NOT support the PICK intent, we add these intent-filter for
-                 backward compatibility. Handle it as GET_CONTENT. -->
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/image" />
-                <data android:mimeType="vnd.android.cursor.dir/video" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/image" />
-                <data android:mimeType="vnd.android.cursor.dir/video" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="com.android.camera.action.REVIEW" />
+                <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
+
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:mimeType="image/bmp" />
-                <data android:mimeType="image/jpeg" />
-                <data android:mimeType="image/gif" />
-                <data android:mimeType="image/png" />
-                <data android:mimeType="image/webp" />
-                <data android:mimeType="image/x-ms-bmp" />
-                <data android:mimeType="image/vnd.wap.wbmp" />
-                <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.android.camera.action.REVIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:mimeType="video/mpeg4" />
-                <data android:mimeType="video/mp4" />
-                <data android:mimeType="video/3gp" />
-                <data android:mimeType="video/3gpp" />
-                <data android:mimeType="video/3gpp2" />
-                <data android:mimeType="application/sdp" />
-            </intent-filter>
-        </activity>
-
-        <!-- we add this activity-alias for shortcut backward compatibility -->
-        <!-- Note: The alias must put after the target activity -->
-        <activity-alias android:name="com.cooliris.media.Gallery"
-                android:targetActivity="com.android.gallery3d.app.Gallery"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:label="@string/app_name">
-            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity-alias>
-
-         <!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
-         media from attached MTP devices, like cameras and camera phones -->
-        <activity android:launchMode="singleInstance"
-            android:taskAffinity="" android:name="com.android.gallery3d.ingest.IngestActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter>
-            <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/device_filter" />
-        </activity>
-        <service android:name="com.android.gallery3d.ingest.IngestService" />
 
-        <activity android:name="com.android.gallery3d.app.Wallpaper"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:theme="@style/android:Theme.Translucent.NoTitleBar">
-            <intent-filter android:label="@string/camera_setas_wallpaper">
-                <action android:name="android.intent.action.ATTACH_DATA" />
-                <data android:mimeType="image/*" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:label="@string/app_name">
-                <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <meta-data android:name="android.wallpaper.preview"
-                    android:resource="@xml/wallpaper_picker_preview" />
-        </activity>
-        <activity android:name="com.android.gallery3d.app.TrimVideo"
-                android:label="@string/trim_label">
-        </activity>
-
-        <permission android:name="com.android.gallery3d.filtershow.permission.READ"
-                    android:protectionLevel="signature" />
-
-        <permission android:name="com.android.gallery3d.filtershow.permission.WRITE"
-                    android:protectionLevel="signature" />
 
-        <provider
-            android:name="com.android.gallery3d.filtershow.provider.SharedImageProvider"
-            android:authorities="com.android.gallery3d.filtershow.provider.SharedImageProvider"
-            android:grantUriPermissions="true"
-            android:readPermission="com.android.gallery3d.filtershow.permission.READ"
-            android:writePermission="com.android.gallery3d.filtershow.permission.WRITE" />
-
-        <service
-                android:name=".filtershow.pipeline.ProcessingService"
-                android:exported="false" />
-
-        <activity
-            android:name="com.android.gallery3d.filtershow.FilterShowActivity"
-            android:label="@string/title_activity_filter_show"
-            android:theme="@style/Theme.FilterShow"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="action_nextgen_edit" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
+            <meta-data
+                android:name="com.android.keyguard.layout"
+                android:resource="@layout/keyguard_widget" />
         </activity>
-
         <activity
-            android:name="com.android.gallery3d.filtershow.crop.CropActivity"
-            android:label="@string/crop"
-            android:theme="@style/Theme.FilterShow"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-           <intent-filter android:label="@string/crop_label">
-                <action android:name="com.android.camera.action.CROP" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:scheme="" />
-                <data android:mimeType="image/*" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.ALTERNATIVE" />
-                <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
-            </intent-filter>
-        </activity>
-
-        <uses-library android:name="com.google.android.media.effects"
-                android:required="false" />
-
-        <activity android:name="com.android.gallery3d.settings.GallerySettings"
-                android:theme="@style/Theme.Gallery"
-                android:configChanges="orientation|keyboardHidden|screenSize" />
-
-        <provider android:name="com.android.gallery3d.provider.GalleryProvider"
-                android:syncable="false"
-                android:grantUriPermissions="true"
-                android:exported="true"
-                android:permission="com.android.gallery3d.permission.GALLERY_PROVIDER"
-                android:authorities="com.android.gallery3d.provider" />
-        <provider
-                android:name="com.android.photos.data.PhotoProvider"
-                android:authorities="com.android.gallery3d.photoprovider"
-                android:syncable="false"
-                android:exported="false"/>
-        <activity android:name="com.android.gallery3d.gadget.WidgetClickHandler" />
-        <activity android:name="com.android.gallery3d.app.DialogPicker"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:theme="@style/DialogPickerTheme"/>
-        <activity android:name="com.android.gallery3d.app.AlbumPicker"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:theme="@style/DialogPickerTheme"/>
-        <activity android:name="com.android.gallery3d.gadget.WidgetTypeChooser"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:theme="@style/Theme.Gallery.Dialog"/>
-        <activity android:name="com.android.camera.CameraActivity"
-                android:taskAffinity="com.android.camera.CameraActivity"
-                android:label="@string/camera_label"
-                android:theme="@style/Theme.Camera"
-                android:icon="@mipmap/ic_launcher_camera"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
-            <intent-filter>
-                <action android:name="android.media.action.IMAGE_CAPTURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.keyguard.layout"
-                    android:resource="@layout/keyguard_widget" />
-        </activity>
-
-        <activity android:name="com.android.camera.SecureCameraActivity"
-                android:taskAffinity="com.android.camera.SecureCameraActivity"
-                android:excludeFromRecents="true"
-                android:label="@string/camera_label"
-                android:theme="@style/Theme.Camera"
-                android:icon="@mipmap/ic_launcher_camera"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+            android:name="com.android.camera.SecureCameraActivity"
+            android:clearTaskOnLaunch="true"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:icon="@mipmap/ic_launcher_camera"
+            android:label="@string/camera_2"
+            android:taskAffinity="com.android.camera.SecureCameraActivity"
+            android:theme="@style/Theme.Camera"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
             <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.keyguard.layout"
-                    android:resource="@layout/keyguard_widget" />
-        </activity>
 
-        <activity-alias android:icon="@mipmap/ic_launcher_camera"
-                        android:label="@string/camera_label"
-                        android:name="com.android.camera.CameraLauncher"
-                        android:targetActivity="com.android.camera.CameraActivity" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity-alias>
-
-        <activity-alias android:icon="@mipmap/ic_launcher_camera"
-                        android:label="@string/camera_label"
-                        android:name="com.android.camera.Camera"
-                        android:targetActivity="com.android.camera.CameraActivity" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
+                <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
 
-        <activity-alias android:icon="@mipmap/ic_launcher_video_camera"
-                android:label="@string/video_camera_label"
-                android:name="com.android.camera.VideoCamera"
-                android:targetActivity="com.android.camera.CameraActivity" >
-            <intent-filter>
-                <action android:name="android.media.action.VIDEO_CAMERA" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.action.VIDEO_CAPTURE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-        </activity-alias>
 
-        <receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider"
-                android:label="@string/appwidget_title">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                    android:resource="@xml/widget_info" />
-        </receiver>
-        <receiver android:name="com.android.gallery3d.app.PackagesMonitor">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.PACKAGE_CHANGED"/>
-                <data android:scheme="package"/>
-            </intent-filter>
-        </receiver>
-        <service android:name="com.android.gallery3d.app.PackagesMonitor$AsyncService"/>
-        <receiver android:name="com.android.camera.CameraButtonIntentReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.CAMERA_BUTTON"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:name="com.android.camera.DisableCameraReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <service android:name="com.android.gallery3d.gadget.WidgetService"
-                android:permission="android.permission.BIND_REMOTEVIEWS"/>
-        <activity android:name="com.android.gallery3d.gadget.WidgetConfigure"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:theme="@style/android:Theme.Translucent.NoTitleBar">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
+            <meta-data
+                android:name="com.android.keyguard.layout"
+                android:resource="@layout/keyguard_widget" />
         </activity>
-        <activity android:name="com.android.camera.ProxyLauncher"
-                android:theme="@style/Theme.ProxyLauncher">
-        </activity>
-        <service android:name="com.android.gallery3d.app.BatchService" />
+
         <service android:name="com.android.camera.MediaSaveService" />
     </application>
-</manifest>
+
+</manifest>
\ No newline at end of file