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

Commit 3910e0e7 authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Remove singleTask mode of panorama."

parents 1955a95d 5320ee47
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -291,10 +291,6 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
        <!-- Suppose users enter panorama from launcher, turn off the screen,
             turn on the screen, and enter the camera from the lock screen.
             They can switch to panorama from there. Use singleTask so there
             will be only one panorama activity. -->
        <activity android:name="com.android.camera.PanoramaActivity"
                android:taskAffinity="com.android.camera"
                android:label="@string/pano_dialog_title"
@@ -302,8 +298,7 @@
                android:configChanges="orientation|screenSize|keyboardHidden"
                android:clearTaskOnLaunch="true"
                android:screenOrientation="behind"
                android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
                android:launchMode="singleTask">
                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
        </activity>
        <receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider"
                android:label="@string/appwidget_title">