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

Commit f36dbcd6 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 767e4ce8 28a7edf3

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 
            </intent-filter>

            <intent-filter>

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

                <action android:name="com.android.camera.action.REVIEW" />

                <action android:name="android.provider.action.REVIEW" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.BROWSABLE" />

                <data android:scheme="" />
@@ -165,7 +165,7 @@ 
                <data android:mimeType="application/vnd.google.panorama360+jpg" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.camera.action.REVIEW" />

                <action android:name="android.provider.action.REVIEW" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.BROWSABLE" />

                <data android:scheme="http" />

src/com/android/gallery3d/app/GalleryActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager; 
import android.graphics.Color;

import android.net.Uri;

import android.os.Bundle;

import android.provider.MediaStore;

import androidx.drawerlayout.widget.DrawerLayout;

import android.text.TextUtils;

import android.util.Log;
@@ -70,7 +71,6 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On 
    public static final String EXTRA_DREAM = "dream";

    public static final String EXTRA_CROP = "crop";



    public static final String ACTION_REVIEW = "com.android.camera.action.REVIEW";

    public static final String KEY_GET_CONTENT = "get-content";

    public static final String KEY_GET_ALBUM = "get-album";

    public static final String KEY_TYPE_BITS = "type-bits";
@@ -265,7 +265,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On 
            startGetContent(intent);

            toggleNavBar(false);

        } else if (Intent.ACTION_VIEW.equalsIgnoreCase(action)

                || ACTION_REVIEW.equalsIgnoreCase(action)){

                || MediaStore.ACTION_REVIEW.equalsIgnoreCase(action)){

            mDrawerLayoutSupported = false;

            Uri uri = intent.getData();

            if (uri != null) {