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

Commit 92d89fd7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose hidden apis used by CTS as TestApi"

parents b0c86619 35a078fb

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -44874,10 +44874,13 @@ package android.view { 
  public final class KeyboardShortcutGroup implements android.os.Parcelable {

    ctor public KeyboardShortcutGroup(java.lang.CharSequence, java.util.List<android.view.KeyboardShortcutInfo>);

    ctor public KeyboardShortcutGroup(java.lang.CharSequence);

    ctor public KeyboardShortcutGroup(java.lang.CharSequence, java.util.List<android.view.KeyboardShortcutInfo>, boolean);

    ctor public KeyboardShortcutGroup(java.lang.CharSequence, boolean);

    method public void addItem(android.view.KeyboardShortcutInfo);

    method public int describeContents();

    method public java.util.List<android.view.KeyboardShortcutInfo> getItems();

    method public java.lang.CharSequence getLabel();

    method public boolean isSystemGroup();

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

    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutGroup> CREATOR;

  }

core/java/android/view/KeyboardShortcutGroup.java

+11 −7
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.android.internal.util.Preconditions.checkNotNull; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -58,6 +59,7 @@ public final class KeyboardShortcutGroup implements Parcelable { 
     * @param isSystemGroup Set this to {@code true} if this is s system group.

     * @hide

     */

    @TestApi

    public KeyboardShortcutGroup(@Nullable CharSequence label,

            @NonNull List<KeyboardShortcutInfo> items, boolean isSystemGroup) {

        mLabel = label;
@@ -70,6 +72,7 @@ public final class KeyboardShortcutGroup implements Parcelable { 
     * @param isSystemGroup Set this to {@code true} if this is s system group.

     * @hide

     */

    @TestApi

    public KeyboardShortcutGroup(@Nullable CharSequence label, boolean isSystemGroup) {

        this(label, Collections.<KeyboardShortcutInfo>emptyList(), isSystemGroup);

    }
@@ -96,6 +99,7 @@ public final class KeyboardShortcutGroup implements Parcelable { 
    }



    /** @hide **/

    @TestApi

    public boolean isSystemGroup() {

        return mSystemGroup;

    }