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

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

Merge "Add type annotation to WindowingMode members." into main

parents 40687c8c 6b447a16

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

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ import android.app.PendingIntent; 
import android.app.ProfilerInfo;

import android.app.WaitResult;

import android.app.WindowConfiguration;

import android.app.WindowConfiguration.WindowingMode;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.Disabled;
@@ -233,6 +234,7 @@ class ActivityStarter { 


    // The task display area to launch the activity onto, barring any strong reason to do otherwise.

    private TaskDisplayArea mPreferredTaskDisplayArea;

    @WindowingMode

    private int mPreferredWindowingMode;



    private Task mInTask;

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier. 
import android.annotation.IntDef;

import android.annotation.Nullable;

import android.app.ActivityOptions;

import android.app.WindowConfiguration.WindowingMode;

import android.content.pm.ActivityInfo.WindowLayout;

import android.graphics.Rect;
@@ -186,6 +187,7 @@ class LaunchParamsController { 
        TaskDisplayArea mPreferredTaskDisplayArea;



        /** The windowing mode to be in. */

        @WindowingMode

        int mWindowingMode;



        /** Sets values back to default. {@link #isEmpty} will return {@code true} once called. */