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

Commit 66f74de3 authored by Miranda Kephart's avatar Miranda Kephart Committed by Matt Casey
Browse files

Update screenshot shelf UI flag name 

Flipping the old flag turned it on in old builds (where the
experience is not ready yet); changing the flag name and re-rolling it
out.

Bug: 329659738
Flag: NONE
(changes now flagged under com.android.systemui.screenshot_shelf_ui2)
Test: manual (device with the old flag has the old UI; flipping the new
flag gets the new (and not broken) UI)

Change-Id: I8250035bf8d33b977088a7aa748d780de306a7e0
Merged-In: I8250035bf8d33b977088a7aa748d780de306a7e0
parent b730f55a

packages/SystemUI/aconfig/systemui.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ flag { 
}



flag {

    name: "screenshot_shelf_ui"

    name: "screenshot_shelf_ui2"

    namespace: "systemui"

    description: "Use new shelf UI flow for screenshots"

    bug: "329659738"

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

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.systemui.screenshot; 
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;

import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT;



import static com.android.systemui.Flags.screenshotShelfUi;

import static com.android.systemui.Flags.screenshotShelfUi2;

import static com.android.systemui.screenshot.LogConfig.DEBUG_ANIM;

import static com.android.systemui.screenshot.LogConfig.DEBUG_CALLBACK;

import static com.android.systemui.screenshot.LogConfig.DEBUG_INPUT;
@@ -403,7 +403,7 @@ public class ScreenshotController { 
            return;

        }



        if (screenshotShelfUi()) {

        if (screenshotShelfUi2()) {

            final UUID requestId = UUID.randomUUID();

            final String screenshotId = String.format("Screenshot_%s", requestId);

            mActionsProvider = mActionsProviderFactory.create(
@@ -454,7 +454,7 @@ public class ScreenshotController { 
        // ignore system bar insets for the purpose of window layout

        mWindow.getDecorView().setOnApplyWindowInsetsListener(

                (v, insets) -> WindowInsets.CONSUMED);

        if (!screenshotShelfUi()) {

        if (!screenshotShelfUi2()) {

            mScreenshotHandler.cancelTimeout(); // restarted after animation

        }

    }
@@ -503,7 +503,7 @@ public class ScreenshotController { 
    }



    boolean isPendingSharedTransition() {

        if (screenshotShelfUi()) {

        if (screenshotShelfUi2()) {

            return mActionExecutor.isPendingSharedTransition();

        } else {

            return mViewProxy.isPendingSharedTransition();
@@ -624,7 +624,7 @@ public class ScreenshotController { 
                (response) -> {

                    mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_IMPRESSION,

                            0, response.getPackageName());

                    if (screenshotShelfUi() && mActionsProvider != null) {

                    if (screenshotShelfUi2() && mActionsProvider != null) {

                        mActionsProvider.onScrollChipReady(

                                () -> onScrollButtonClicked(owner, response));

                    } else {

packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.screenshot.dagger;



import static com.android.systemui.Flags.screenshotShelfUi;

import static com.android.systemui.Flags.screenshotShelfUi2;



import android.app.Service;

import android.view.accessibility.AccessibilityManager;
@@ -102,7 +102,7 @@ public abstract class ScreenshotModule { 
    static ScreenshotViewProxy.Factory providesScreenshotViewProxyFactory(

            ScreenshotShelfViewProxy.Factory shelfScreenshotViewProxyFactory,

            LegacyScreenshotViewProxy.Factory legacyScreenshotViewProxyFactory) {

        if (screenshotShelfUi()) {

        if (screenshotShelfUi2()) {

            return shelfScreenshotViewProxyFactory;

        } else {

            return legacyScreenshotViewProxyFactory;