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

Commit 3717eb05 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Use sysproperties to check PiP2 flag for dev 

Use system properties to check for the "PiP2 flag"
for easier and quicker testing and development.

This is meant to be reverted once before we move on to
teamfooding stages as a part of trunk-stable.

Bug: 311462191
Test: adb shell setprop wm_shell.pip2 1;
      adb shell am crash com.android.systemui
Change-Id: I11630369715fd02be50d9cc9aa1f15c47e44815a
parent cdc6a51c

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.WindowConfiguration 
import android.content.ComponentName

import android.content.Context

import android.os.RemoteException

import android.os.SystemProperties

import android.util.DisplayMetrics

import android.util.Log

import android.util.Pair
@@ -137,5 +138,6 @@ object PipUtils { 


    @JvmStatic

    val isPip2ExperimentEnabled: Boolean

        get() = Flags.enablePip2Implementation()

        get() = Flags.enablePip2Implementation() || SystemProperties.getBoolean(

                "wm_shell.pip2", false)

}
 
 No newline at end of file

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -7399,6 +7399,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    }



    static boolean isPip2ExperimentEnabled() {

        return Flags.enablePip2Implementation();

        return Flags.enablePip2Implementation() || SystemProperties.getBoolean(

                "wm_shell.pip2", false);

    }

}