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

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

Merge "Check if Shell Transition is enabled for auto" into main

parents 2f4e0476 11b470d4

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+18 −1
Original line number Original line Diff line number Diff line
@@ -58,18 +58,22 @@ import android.app.Activity; 
import android.app.ActivityClient;

import android.app.ActivityClient;

import android.app.ActivityOptions;

import android.app.ActivityOptions;

import android.app.ActivityThread;

import android.app.ActivityThread;

import android.app.AppGlobals;

import android.app.Application;

import android.app.Application;

import android.app.Instrumentation;

import android.app.Instrumentation;

import android.app.servertransaction.ClientTransactionListenerController;

import android.app.servertransaction.ClientTransactionListenerController;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Log;

import android.util.Log;
@@ -116,7 +120,7 @@ import java.util.function.BiConsumer; 
public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmentCallback,

public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmentCallback,

        ActivityEmbeddingComponent, DividerPresenter.DragEventCallback {

        ActivityEmbeddingComponent, DividerPresenter.DragEventCallback {

    static final String TAG = "SplitController";

    static final String TAG = "SplitController";

    static final boolean ENABLE_SHELL_TRANSITIONS = true;

    static final boolean ENABLE_SHELL_TRANSITIONS = getShellTransitEnabled();





    // TODO(b/243518738): Move to WM Extensions if we have requirement of overlay without

    // TODO(b/243518738): Move to WM Extensions if we have requirement of overlay without

    //  association. It's not set in WM Extensions nor Wm Jetpack library currently.

    //  association. It's not set in WM Extensions nor Wm Jetpack library currently.
@@ -3309,4 +3313,17 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            transactionRecord.apply(false /* shouldApplyIndependently */);

            transactionRecord.apply(false /* shouldApplyIndependently */);

        }

        }

    }

    }



    // TODO(b/207070762): cleanup with legacy app transition

    private static boolean getShellTransitEnabled() {

        try {

            if (AppGlobals.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_AUTOMOTIVE, 0)) {

                return SystemProperties.getBoolean("persist.wm.debug.shell_transit", true);

            }

        } catch (RemoteException re) {

            Log.w(TAG, "Error getting system features");

        }

        return true;

    }

}
 
}