Merge "Round out the QS API" (561e2190) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -33726,17 +33726,24 @@ package android.service.quicksettings {
		method public java.lang.CharSequence getContentDescription();
		method public android.graphics.drawable.Icon getIcon();
		method public java.lang.CharSequence getLabel();
		method public int getState();
		method public void setContentDescription(java.lang.CharSequence);
		method public void setIcon(android.graphics.drawable.Icon);
		method public void setLabel(java.lang.CharSequence);
		method public void setState(int);
		method public void updateTile();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
		field public static final int STATE_ACTIVE = 2; // 0x2
		field public static final int STATE_INACTIVE = 1; // 0x1
		field public static final int STATE_UNAVAILABLE = 0; // 0x0
		}

		public class TileService extends android.app.Service {
		ctor public TileService();
		method public final android.service.quicksettings.Tile getQsTile();
		method public final boolean isLocked();
		method public final boolean isSecure();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onClick();
		method public void onStartListening();
		@@ -33745,6 +33752,8 @@ package android.service.quicksettings {
		method public void onTileRemoved();
		method public static final void requestListeningState(android.content.Context, android.content.ComponentName);
		method public final void showDialog(android.app.Dialog);
		method public final void startActivityAndCollapse(android.content.Intent);
		method public final void unlockAndRun(java.lang.Runnable);
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		field public static final int TILE_MODE_ACTIVE = 2; // 0x2
		field public static final int TILE_MODE_PASSIVE = 1; // 0x1

api/system-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -35896,17 +35896,24 @@ package android.service.quicksettings {
		method public java.lang.CharSequence getContentDescription();
		method public android.graphics.drawable.Icon getIcon();
		method public java.lang.CharSequence getLabel();
		method public int getState();
		method public void setContentDescription(java.lang.CharSequence);
		method public void setIcon(android.graphics.drawable.Icon);
		method public void setLabel(java.lang.CharSequence);
		method public void setState(int);
		method public void updateTile();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
		field public static final int STATE_ACTIVE = 2; // 0x2
		field public static final int STATE_INACTIVE = 1; // 0x1
		field public static final int STATE_UNAVAILABLE = 0; // 0x0
		}

		public class TileService extends android.app.Service {
		ctor public TileService();
		method public final android.service.quicksettings.Tile getQsTile();
		method public final boolean isLocked();
		method public final boolean isSecure();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onClick();
		method public void onStartListening();
		@@ -35916,6 +35923,8 @@ package android.service.quicksettings {
		method public static final void requestListeningState(android.content.Context, android.content.ComponentName);
		method public final void setStatusIcon(android.graphics.drawable.Icon, java.lang.String);
		method public final void showDialog(android.app.Dialog);
		method public final void startActivityAndCollapse(android.content.Intent);
		method public final void unlockAndRun(java.lang.Runnable);
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		field public static final int TILE_MODE_ACTIVE = 2; // 0x2
		field public static final int TILE_MODE_PASSIVE = 1; // 0x1

api/test-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -33740,17 +33740,24 @@ package android.service.quicksettings {
		method public java.lang.CharSequence getContentDescription();
		method public android.graphics.drawable.Icon getIcon();
		method public java.lang.CharSequence getLabel();
		method public int getState();
		method public void setContentDescription(java.lang.CharSequence);
		method public void setIcon(android.graphics.drawable.Icon);
		method public void setLabel(java.lang.CharSequence);
		method public void setState(int);
		method public void updateTile();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
		field public static final int STATE_ACTIVE = 2; // 0x2
		field public static final int STATE_INACTIVE = 1; // 0x1
		field public static final int STATE_UNAVAILABLE = 0; // 0x0
		}

		public class TileService extends android.app.Service {
		ctor public TileService();
		method public final android.service.quicksettings.Tile getQsTile();
		method public final boolean isLocked();
		method public final boolean isSecure();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onClick();
		method public void onStartListening();
		@@ -33759,6 +33766,8 @@ package android.service.quicksettings {
		method public void onTileRemoved();
		method public static final void requestListeningState(android.content.Context, android.content.ComponentName);
		method public final void showDialog(android.app.Dialog);
		method public final void startActivityAndCollapse(android.content.Intent);
		method public final void unlockAndRun(java.lang.Runnable);
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		field public static final int TILE_MODE_ACTIVE = 2; // 0x2
		field public static final int TILE_MODE_PASSIVE = 1; // 0x1

core/java/android/service/quicksettings/IQSService.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -27,5 +27,9 @@ interface IQSService {
		void updateStatusIcon(in Tile tile, in Icon icon,
		String contentDescription);
		void onShowDialog(in Tile tile);
		void onStartActivity(in Tile tile);
		void setTileMode(in ComponentName component, int mode);
		boolean isLocked();
		boolean isSecure();
		void startUnlockAndRun(in Tile tile);
		}

core/java/android/service/quicksettings/IQSTileService.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,4 +29,5 @@ oneway interface IQSTileService {
		void onStartListening();
		void onStopListening();
		void onClick(IBinder wtoken);
		void onUnlockComplete();
		}