Merge "Add Quick Settings API" (ee35d738) · Commits · e / os / android_frameworks_base

Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,8 @@ LOCAL_SRC_FILES += \
		packages/services/PacProcessor/com/android/net/IProxyService.aidl \
		packages/services/Proxy/com/android/net/IProxyCallback.aidl \
		packages/services/Proxy/com/android/net/IProxyPortListener.aidl \
		core/java/android/service/quicksettings/IQSService.aidl \
		core/java/android/service/quicksettings/IQSTileService.aidl \

		# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
		LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
		@@ -626,6 +628,7 @@ aidl_files := \
		frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \
		frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \
		frameworks/base/core/java/android/database/CursorWindow.aidl \
		frameworks/base/core/java/android/service/quicksettings/Tile.aidl \

		gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
		$(gen): PRIVATE_SRC_FILES := $(aidl_files)

api/current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ package android {
		field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
		field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		@@ -29051,6 +29052,35 @@ package android.service.notification {

		}

		package android.service.quicksettings {

		public final class Tile implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.CharSequence getContentDescription();
		method public android.graphics.drawable.Icon getIcon();
		method public java.lang.CharSequence getLabel();
		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 updateTile();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
		}

		public class TileService extends android.app.Service {
		ctor public TileService();
		method public final android.service.quicksettings.Tile getQsTile();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onClick();
		method public void onStartListening();
		method public void onStopListening();
		method public void onTileAdded();
		method public void onTileRemoved();
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		}

		}

		package android.service.restrictions {

		public abstract class RestrictionsReceiver extends android.content.BroadcastReceiver {

api/system-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ package android {
		field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
		field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		@@ -31199,6 +31200,35 @@ package android.service.persistentdata {

		}

		package android.service.quicksettings {

		public final class Tile implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.CharSequence getContentDescription();
		method public android.graphics.drawable.Icon getIcon();
		method public java.lang.CharSequence getLabel();
		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 updateTile();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
		}

		public class TileService extends android.app.Service {
		ctor public TileService();
		method public final android.service.quicksettings.Tile getQsTile();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onClick();
		method public void onStartListening();
		method public void onStopListening();
		method public void onTileAdded();
		method public void onTileRemoved();
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		}

		}

		package android.service.restrictions {

		public abstract class RestrictionsReceiver extends android.content.BroadcastReceiver {

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

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.service.quicksettings;

		import android.content.ComponentName;
		import android.service.quicksettings.Tile;

		/**
		* @hide
		*/
		interface IQSService {
		void updateQsTile(in Tile tile);
		}

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

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.service.quicksettings;

		import android.service.quicksettings.Tile;
		import android.service.quicksettings.IQSService;

		/**
		* @hide
		*/
		oneway interface IQSTileService {
		void setQSTile(in Tile tile);
		void onTileAdded();
		void onTileRemoved();
		void onStartListening();
		void onStopListening();
		void onClick();
		}