Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeb5b71b authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce

parents beba6b1c 93074e91

AndroidManifest.xml

+11 −23
Original line number Diff line number Diff line
@@ -87,12 +87,8 @@ 
             </intent-filter>

        </activity>



        <activity

                android:name="com.android.photos.GalleryActivity"

                android:label="@string/app_name"

                android:configChanges="keyboardHidden|orientation|screenSize"

                android:theme="@style/Theme.Photos.Gallery"

                android:uiOptions="splitActionBarWhenNarrow">

        <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" />
@@ -125,18 +121,6 @@ 
                <data android:mimeType="vnd.android.cursor.dir/image" />

                <data android:mimeType="vnd.android.cursor.dir/video" />

            </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">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -179,12 +163,16 @@ 
            </intent-filter>

        </activity>



        <activity android:name="com.android.photos.FullscreenViewer"

                android:label="@string/app_name"

        <!-- 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:theme="@style/Theme.Photos.Fullscreen"

                android:parentActivityName="com.android.photos.GalleryActivity">

        </activity>

                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 -->