Merge "Remove redudant setName" into gb-ub-photos-bryce

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 06ebd86..30891e1 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest android:versionCode="40004"
-        android:versionName="1.1.40004"
+<manifest android:versionCode="40007"
+        android:versionName="1.1.40007"
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.gallery3d">
 
@@ -128,6 +128,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">
@@ -400,29 +407,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="com.google.android.pano.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>