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

Commit 4ad3a639 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Refactor GlobalScreenshot 

Pull apart into View vs Controller model, to separate views/
animations from state handling.

This is a large change, but not as large as it looks since
most sections are copied from GlobalScreenshot into either
ScreenshotView or ScreenshotController.

Roughly speaking, ScreenshotController handles the overall
screenshot initiation, flow, and callbacks, while
ScreenshotView handles the subviews and constructs the
animations.

Test: manual

Change-Id: Ic3238571ac2d7aa749eff078c2297f2b6ed06b78
parent 4d8ef8f2

packages/SystemUI/res/layout/global_screenshot.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->

<FrameLayout

<com.android.systemui.screenshot.ScreenshotView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/global_screenshot_frame"

    android:id="@+id/global_screenshot_frame"

    android:layout_width="match_parent"

    android:layout_width="match_parent"
@@ -62,4 +62,4 @@ 
            android:layout_margin="@dimen/screenshot_dismiss_button_margin"

            android:layout_margin="@dimen/screenshot_dismiss_button_margin"

            android:src="@drawable/screenshot_cancel"/>

            android:src="@drawable/screenshot_cancel"/>

    </FrameLayout>

    </FrameLayout>

</FrameLayout>
 
</com.android.systemui.screenshot.ScreenshotView>

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -16,12 +16,12 @@ 




package com.android.systemui.screenshot;

package com.android.systemui.screenshot;





import static com.android.systemui.screenshot.GlobalScreenshot.ACTION_TYPE_EDIT;

import static com.android.systemui.screenshot.ScreenshotController.ACTION_TYPE_EDIT;

import static com.android.systemui.screenshot.GlobalScreenshot.ACTION_TYPE_SHARE;

import static com.android.systemui.screenshot.ScreenshotController.ACTION_TYPE_SHARE;

import static com.android.systemui.screenshot.GlobalScreenshot.EXTRA_ACTION_INTENT;

import static com.android.systemui.screenshot.ScreenshotController.EXTRA_ACTION_INTENT;

import static com.android.systemui.screenshot.GlobalScreenshot.EXTRA_DISALLOW_ENTER_PIP;

import static com.android.systemui.screenshot.ScreenshotController.EXTRA_DISALLOW_ENTER_PIP;

import static com.android.systemui.screenshot.GlobalScreenshot.EXTRA_ID;

import static com.android.systemui.screenshot.ScreenshotController.EXTRA_ID;

import static com.android.systemui.screenshot.GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED;

import static com.android.systemui.screenshot.ScreenshotController.EXTRA_SMART_ACTIONS_ENABLED;

import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_SCREENSHOT;

import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_SCREENSHOT;





import android.app.ActivityOptions;

import android.app.ActivityOptions;

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -16,10 +16,10 @@ 




package com.android.systemui.screenshot;

package com.android.systemui.screenshot;





import static com.android.systemui.screenshot.GlobalScreenshot.ACTION_TYPE_DELETE;

import static com.android.systemui.screenshot.ScreenshotController.ACTION_TYPE_DELETE;

import static com.android.systemui.screenshot.GlobalScreenshot.EXTRA_ID;

import static com.android.systemui.screenshot.ScreenshotController.EXTRA_ID;

import static com.android.systemui.screenshot.GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED;

import static com.android.systemui.screenshot.ScreenshotController.EXTRA_SMART_ACTIONS_ENABLED;

import static com.android.systemui.screenshot.GlobalScreenshot.SCREENSHOT_URI_ID;

import static com.android.systemui.screenshot.ScreenshotController.SCREENSHOT_URI_ID;





import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.ContentResolver;

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

+19 −19
Original line number Original line Diff line number Diff line
@@ -82,8 +82,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 




    private final Context mContext;

    private final Context mContext;

    private final ScreenshotSmartActions mScreenshotSmartActions;

    private final ScreenshotSmartActions mScreenshotSmartActions;

    private final GlobalScreenshot.SaveImageInBackgroundData mParams;

    private final ScreenshotController.SaveImageInBackgroundData mParams;

    private final GlobalScreenshot.SavedImageData mImageData;

    private final ScreenshotController.SavedImageData mImageData;

    private final String mImageFileName;

    private final String mImageFileName;

    private final long mImageTime;

    private final long mImageTime;

    private final ScreenshotNotificationSmartActionsProvider mSmartActionsProvider;

    private final ScreenshotNotificationSmartActionsProvider mSmartActionsProvider;
@@ -92,10 +92,10 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
    private final Random mRandom = new Random();

    private final Random mRandom = new Random();





    SaveImageInBackgroundTask(Context context, ScreenshotSmartActions screenshotSmartActions,

    SaveImageInBackgroundTask(Context context, ScreenshotSmartActions screenshotSmartActions,

            GlobalScreenshot.SaveImageInBackgroundData data) {

            ScreenshotController.SaveImageInBackgroundData data) {

        mContext = context;

        mContext = context;

        mScreenshotSmartActions = screenshotSmartActions;

        mScreenshotSmartActions = screenshotSmartActions;

        mImageData = new GlobalScreenshot.SavedImageData();

        mImageData = new ScreenshotController.SavedImageData();





        // Prepare all the output metadata

        // Prepare all the output metadata

        mParams = data;

        mParams = data;
@@ -234,7 +234,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
     * Update the listener run when the saving task completes. Used to avoid showing UI for the

     * Update the listener run when the saving task completes. Used to avoid showing UI for the

     * first screenshot when a second one is taken.

     * first screenshot when a second one is taken.

     */

     */

    void setActionsReadyListener(GlobalScreenshot.ActionsReadyListener listener) {

    void setActionsReadyListener(ScreenshotController.ActionsReadyListener listener) {

        mParams.mActionsReadyListener = listener;

        mParams.mActionsReadyListener = listener;

    }

    }
@@ -287,10 +287,10 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        // Create a share action for the notification

        // Create a share action for the notification

        PendingIntent shareAction = PendingIntent.getBroadcastAsUser(context, requestCode,

        PendingIntent shareAction = PendingIntent.getBroadcastAsUser(context, requestCode,

                new Intent(context, ActionProxyReceiver.class)

                new Intent(context, ActionProxyReceiver.class)

                        .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, pendingIntent)

                        .putExtra(ScreenshotController.EXTRA_ACTION_INTENT, pendingIntent)

                        .putExtra(GlobalScreenshot.EXTRA_DISALLOW_ENTER_PIP, true)

                        .putExtra(ScreenshotController.EXTRA_DISALLOW_ENTER_PIP, true)

                        .putExtra(GlobalScreenshot.EXTRA_ID, mScreenshotId)

                        .putExtra(ScreenshotController.EXTRA_ID, mScreenshotId)

                        .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED,

                        .putExtra(ScreenshotController.EXTRA_SMART_ACTIONS_ENABLED,

                                mSmartActionsEnabled)

                                mSmartActionsEnabled)

                        .setAction(Intent.ACTION_SEND)

                        .setAction(Intent.ACTION_SEND)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
@@ -332,9 +332,9 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        // Create a edit action

        // Create a edit action

        PendingIntent editAction = PendingIntent.getBroadcastAsUser(context, requestCode,

        PendingIntent editAction = PendingIntent.getBroadcastAsUser(context, requestCode,

                new Intent(context, ActionProxyReceiver.class)

                new Intent(context, ActionProxyReceiver.class)

                        .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, pendingIntent)

                        .putExtra(ScreenshotController.EXTRA_ACTION_INTENT, pendingIntent)

                        .putExtra(GlobalScreenshot.EXTRA_ID, mScreenshotId)

                        .putExtra(ScreenshotController.EXTRA_ID, mScreenshotId)

                        .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED,

                        .putExtra(ScreenshotController.EXTRA_SMART_ACTIONS_ENABLED,

                                mSmartActionsEnabled)

                                mSmartActionsEnabled)

                        .setAction(Intent.ACTION_EDIT)

                        .setAction(Intent.ACTION_EDIT)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
@@ -355,9 +355,9 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        // Create a delete action for the notification

        // Create a delete action for the notification

        PendingIntent deleteAction = PendingIntent.getBroadcast(context, requestCode,

        PendingIntent deleteAction = PendingIntent.getBroadcast(context, requestCode,

                new Intent(context, DeleteScreenshotReceiver.class)

                new Intent(context, DeleteScreenshotReceiver.class)

                        .putExtra(GlobalScreenshot.SCREENSHOT_URI_ID, uri.toString())

                        .putExtra(ScreenshotController.SCREENSHOT_URI_ID, uri.toString())

                        .putExtra(GlobalScreenshot.EXTRA_ID, mScreenshotId)

                        .putExtra(ScreenshotController.EXTRA_ID, mScreenshotId)

                        .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED,

                        .putExtra(ScreenshotController.EXTRA_SMART_ACTIONS_ENABLED,

                                mSmartActionsEnabled)

                                mSmartActionsEnabled)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
@@ -395,7 +395,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                    ScreenshotNotificationSmartActionsProvider.ACTION_TYPE,

                    ScreenshotNotificationSmartActionsProvider.ACTION_TYPE,

                    ScreenshotNotificationSmartActionsProvider.DEFAULT_ACTION_TYPE);

                    ScreenshotNotificationSmartActionsProvider.DEFAULT_ACTION_TYPE);

            Intent intent = new Intent(context, SmartActionsReceiver.class)

            Intent intent = new Intent(context, SmartActionsReceiver.class)

                    .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, action.actionIntent)

                    .putExtra(ScreenshotController.EXTRA_ACTION_INTENT, action.actionIntent)

                    .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

                    .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            addIntentExtras(mScreenshotId, intent, actionType, mSmartActionsEnabled);

            addIntentExtras(mScreenshotId, intent, actionType, mSmartActionsEnabled);

            PendingIntent broadcastIntent = PendingIntent.getBroadcast(context,

            PendingIntent broadcastIntent = PendingIntent.getBroadcast(context,
@@ -411,9 +411,9 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
    private static void addIntentExtras(String screenshotId, Intent intent, String actionType,

    private static void addIntentExtras(String screenshotId, Intent intent, String actionType,

            boolean smartActionsEnabled) {

            boolean smartActionsEnabled) {

        intent

        intent

                .putExtra(GlobalScreenshot.EXTRA_ACTION_TYPE, actionType)

                .putExtra(ScreenshotController.EXTRA_ACTION_TYPE, actionType)

                .putExtra(GlobalScreenshot.EXTRA_ID, screenshotId)

                .putExtra(ScreenshotController.EXTRA_ID, screenshotId)

                .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED, smartActionsEnabled);

                .putExtra(ScreenshotController.EXTRA_SMART_ACTIONS_ENABLED, smartActionsEnabled);

    }

    }