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

Commit 4658046b authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge changes Iffb62170,I9b795928 into tm-qpr-dev 

* changes:
  Clean up leaked screenshot connections
  Always reset screenshot preview to alpha=1
parents dc3bd363 9f8f1fd9

core/java/com/android/internal/util/ScreenshotHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -377,6 +377,9 @@ public class ScreenshotHelper { 
            msg.replyTo = new Messenger(h);



            if (mScreenshotConnection == null || mScreenshotService == null) {

                if (mScreenshotConnection != null) {

                    resetConnection();

                }

                final ComponentName serviceComponent = ComponentName.unflattenFromString(

                        mContext.getResources().getString(

                                com.android.internal.R.string.config_screenshotServiceComponent));

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

+2 −1
Original line number Diff line number Diff line
@@ -555,6 +555,8 @@ public class ScreenshotController { 
                mScreenshotView.announceForAccessibility(

                        mContext.getResources().getString(R.string.screenshot_saving_title)));



        mScreenshotView.reset();



        if (mScreenshotView.isAttachedToWindow()) {

            // if we didn't already dismiss for another reason

            if (!mScreenshotView.isDismissing()) {
@@ -564,7 +566,6 @@ public class ScreenshotController { 
                Log.d(TAG, "saveScreenshot: screenshotView is already attached, resetting. "

                        + "(dismissing=" + mScreenshotView.isDismissing() + ")");

            }

            mScreenshotView.reset();

        }

        mPackageName = topComponent == null ? "" : topComponent.getPackageName();

        mScreenshotView.setPackageName(mPackageName);

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

+1 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,7 @@ public class ScreenshotView extends FrameLayout implements 
        // Clear any references to the bitmap

        mScreenshotPreview.setImageDrawable(null);

        mScreenshotPreview.setVisibility(View.INVISIBLE);

        mScreenshotPreview.setAlpha(1f);

        mScreenshotPreviewBorder.setAlpha(0);

        mPendingSharedTransition = false;

        mActionsContainerBackground.setVisibility(View.GONE);