am 711d2c79: Reconcile with jb-mr2-release - do not merge

[android-x86/packages-apps-Gallery2.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3da58f7..87c7b80 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest android:versionCode="40003"
-        android:versionName="1.1.40003"
+<manifest android:versionCode="40009"
+        android:versionName="1.1.40009"
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.gallery3d">
 
@@ -20,7 +20,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -128,6 +127,13 @@
             </intent-filter>
         </activity>
         <activity
+                android:name="com.android.photos.AlbumActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:theme="@style/Theme.Photos.Gallery"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:exported="false">
+       </activity>
+       <activity
                 android:name="com.android.gallery3d.app.Gallery"
                 android:label="@string/app_name"
                 android:configChanges="keyboardHidden|orientation|screenSize">
@@ -240,7 +246,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
             </intent-filter>
-            <intent-filter android:label="@string/crop_label">
+        </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" />
@@ -283,6 +296,19 @@
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:theme="@style/Theme.Gallery.Dialog"/>
 
+        <activity android:name="com.android.camera.NewCameraActivity"
+                android:taskAffinity="com.android.camera.NewCameraActivity"
+                android:theme="@style/Theme.Camera"
+                android:label="@string/camera_label"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="com.android.camera.CameraActivity"
                 android:taskAffinity="com.android.camera.CameraActivity"
                 android:label="@string/camera_label"
@@ -400,29 +426,5 @@
         </activity>
         <service android:name="com.android.gallery3d.app.BatchService" />
         <service android:name="com.android.camera.MediaSaveService" />
-
-        <!-- canvas -->
-        <provider
-            android:name="com.android.photos.canvas.CanvasProvider"
-            android:authorities="com.android.gallery3d.provider.CanvasProvider"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:permission="android.permission.ACCESS_APP_BROWSE_DATA" />
-        <activity android:name="com.android.photos.canvas.EnableSyncActivity"
-                android:exported="true"
-                android:theme="@style/Theme.ProxyLauncher">
-        </activity>
-        <activity android:name="com.android.photos.canvas.CanvasActivity"
-                android:label="@string/app_name"
-                android:exported="true"
-                android:theme="@style/Theme.ProxyLauncher">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.google.android.pano.category.BROWSE_LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="com.google.android.canvas.pano.launcher_info"
-                android:resource="@xml/canvas_info" />
-        </activity>
     </application>
 </manifest>