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

Commit 56034a4f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev am: 9d19487b 

am: 9f6c8feb

Change-Id: Ia6008e05fe7a7b369be2d9a84bcedc94d74c5334
parents 59eaddaf 9f6c8feb

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ package android.content { 
package android.content.pm {



  public class ActivityInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable {

    method public static boolean isTranslucentOrFloating(android.content.res.TypedArray);

    field public static final int RESIZE_MODE_RESIZEABLE = 2; // 0x2

  }

core/java/android/content/pm/ActivityInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
     * Determines whether the {@link Activity} is considered translucent or floating.

     * @hide

     */

    @TestApi

    public static boolean isTranslucentOrFloating(TypedArray attributes) {

        final boolean isTranslucent =

                attributes.getBoolean(com.android.internal.R.styleable.Window_windowIsTranslucent,

core/proto/android/server/activitymanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ message ActivityRecordProto { 
    optional bool visible = 4;

    optional bool front_of_task = 5;

    optional int32 proc_id = 6;

    optional bool translucent = 7;

}



message KeyguardControllerProto {

services/core/java/com/android/server/am/ActivityRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ import static com.android.server.am.ActivityRecordProto.FRONT_OF_TASK; 
import static com.android.server.am.ActivityRecordProto.IDENTIFIER;

import static com.android.server.am.ActivityRecordProto.PROC_ID;

import static com.android.server.am.ActivityRecordProto.STATE;

import static com.android.server.am.ActivityRecordProto.TRANSLUCENT;

import static com.android.server.am.ActivityRecordProto.VISIBLE;

import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_LEFT;

import static com.android.server.wm.IdentifierProto.HASH_CODE;
@@ -2980,6 +2981,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
        if (app != null) {

            proto.write(PROC_ID, app.pid);

        }

        proto.write(TRANSLUCENT, !fullscreen);

        proto.end(token);

    }

}