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

Commit 6b88baf1 authored by Winson Chung's avatar Winson Chung
Browse files

Adding enabled state for remote actions. 

- Actions can specify whether they are enabled (default) or disabled, and
  SystemUI will reflect the state in the PiP actions.

Bug: 36363677
Test: Expand pip with dismissed action
Change-Id: I36994868f82d8ba0fc87947a722d9f20b39425a1
parent d7bc388f

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -5717,6 +5717,8 @@ package android.app { 
    method public java.lang.CharSequence getContentDescription();

    method public android.graphics.drawable.Icon getIcon();

    method public java.lang.CharSequence getTitle();

    method public boolean isEnabled();

    method public void setEnabled(boolean);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.RemoteAction> CREATOR;

  }
@@ -45423,7 +45425,7 @@ package android.view { 
    method public void setActivated(boolean);

    method public void setAlpha(float);

    method public void setAnimation(android.view.animation.Animation);

    method public void setAutofillHint(java.lang.String[]);

    method public void setAutofillHint(java.lang.String...);

    method public void setAutofillMode(int);

    method public void setBackground(android.graphics.drawable.Drawable);

    method public void setBackgroundColor(int);

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -5924,6 +5924,8 @@ package android.app { 
    method public java.lang.CharSequence getContentDescription();

    method public android.graphics.drawable.Icon getIcon();

    method public java.lang.CharSequence getTitle();

    method public boolean isEnabled();

    method public void setEnabled(boolean);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.RemoteAction> CREATOR;

  }
@@ -48889,7 +48891,7 @@ package android.view { 
    method public void setActivated(boolean);

    method public void setAlpha(float);

    method public void setAnimation(android.view.animation.Animation);

    method public void setAutofillHint(java.lang.String[]);

    method public void setAutofillHint(java.lang.String...);

    method public void setAutofillMode(int);

    method public void setBackground(android.graphics.drawable.Drawable);

    method public void setBackgroundColor(int);

api/test-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -5728,6 +5728,8 @@ package android.app { 
    method public java.lang.CharSequence getContentDescription();

    method public android.graphics.drawable.Icon getIcon();

    method public java.lang.CharSequence getTitle();

    method public boolean isEnabled();

    method public void setEnabled(boolean);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.RemoteAction> CREATOR;

  }
@@ -45786,7 +45788,7 @@ package android.view { 
    method public void setActivated(boolean);

    method public void setAlpha(float);

    method public void setAnimation(android.view.animation.Animation);

    method public void setAutofillHint(java.lang.String[]);

    method public void setAutofillHint(java.lang.String...);

    method public void setAutofillMode(int);

    method public void setBackground(android.graphics.drawable.Drawable);

    method public void setBackgroundColor(int);

core/java/android/app/RemoteAction.java

+22 −1
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ public final class RemoteAction implements Parcelable { 
    private final CharSequence mTitle;

    private final CharSequence mContentDescription;

    private final PendingIntent mActionIntent;

    private boolean mEnabled;



    RemoteAction(Parcel in) {

        mIcon = Icon.CREATOR.createFromParcel(in);

        mTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        mContentDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        mActionIntent = PendingIntent.CREATOR.createFromParcel(in);

        mEnabled = in.readBoolean();

    }



    public RemoteAction(@NonNull Icon icon, @NonNull CharSequence title,
@@ -59,6 +61,21 @@ public final class RemoteAction implements Parcelable { 
        mTitle = title;

        mContentDescription = contentDescription;

        mActionIntent = intent;

        mEnabled = true;

    }



    /**

     * Sets whether this action is enabled.

     */

    public void setEnabled(boolean enabled) {

        mEnabled = enabled;

    }



    /**

     * Return whether this action is enabled.

     */

    public boolean isEnabled() {

        return mEnabled;

    }



    /**
@@ -91,7 +108,9 @@ public final class RemoteAction implements Parcelable { 


    @Override

    public RemoteAction clone() {

        return new RemoteAction(mIcon, mTitle, mContentDescription, mActionIntent);

        RemoteAction action = new RemoteAction(mIcon, mTitle, mContentDescription, mActionIntent);

        action.setEnabled(mEnabled);

        return action;

    }



    @Override
@@ -105,11 +124,13 @@ public final class RemoteAction implements Parcelable { 
        TextUtils.writeToParcel(mTitle, out, flags);

        TextUtils.writeToParcel(mContentDescription, out, flags);

        mActionIntent.writeToParcel(out, flags);

        out.writeBoolean(mEnabled);

    }



    public void dump(String prefix, PrintWriter pw) {

        pw.print(prefix);

        pw.print("title=" + mTitle);

        pw.print(" enabled=" + mEnabled);

        pw.print(" contentDescription=" + mContentDescription);

        pw.print(" icon=" + mIcon);

        pw.print(" action=" + mActionIntent.getIntent());

packages/SystemUI/res/layout/pip_menu_action.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ 
    android:layout_width="@dimen/pip_action_size"

    android:layout_height="@dimen/pip_action_size"

    android:padding="@dimen/pip_action_padding"

    android:background="?android:selectableItemBackgroundBorderless" />
 
 No newline at end of file
 
    android:background="?android:selectableItemBackgroundBorderless"

    android:forceHasOverlappingRendering="false" />
 
 No newline at end of file