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

Commit fbfcea77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix screenshot exif attributes"

parents c67d9d80 e1a22b92

packages/SystemUI/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ android_library { 
        "androidx.lifecycle_lifecycle-extensions",

        "androidx.dynamicanimation_dynamicanimation",

        "androidx-constraintlayout_constraintlayout",

        "androidx.exifinterface_exifinterface",

        "kotlinx-coroutines-android",

        "kotlinx-coroutines-core",

        "iconloader_base",
@@ -140,6 +141,7 @@ android_library { 
        "androidx.lifecycle_lifecycle-extensions",

        "androidx.dynamicanimation_dynamicanimation",

        "androidx-constraintlayout_constraintlayout",

        "androidx.exifinterface_exifinterface",

        "kotlinx-coroutines-android",

        "kotlinx-coroutines-core",

        "iconloader_base",

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ 
    <!-- Notification text displayed when we fail to save a screenshot for unknown reasons. [CHAR LIMIT=100] -->

    <string name="screenshot_failed_to_save_unknown_text">Try taking screenshot again</string>

    <!-- Notification text displayed when we fail to save a screenshot. [CHAR LIMIT=100] -->

    <string name="screenshot_failed_to_save_text">Can\'t save screenshot due to limited storage space</string>

    <string name="screenshot_failed_to_save_text">Can\'t save screenshot</string>

    <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->

    <string name="screenshot_failed_to_capture_text">Taking screenshots isn\'t allowed by the app or

        your organization</string>

packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.Intent; 
import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.drawable.Icon;

import android.media.ExifInterface;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Build;
@@ -52,6 +51,8 @@ import android.text.TextUtils; 
import android.text.format.DateUtils;

import android.util.Log;



import androidx.exifinterface.media.ExifInterface;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;

import com.android.systemui.R;