Merge "Better service management for QS 3rd party tiles" (24145bf1) · Commits · e / os / android_frameworks_base

core/java/android/service/quicksettings/TileService.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -26,17 +26,17 @@ import android.os.RemoteException;
		import android.view.WindowManager;

		/**
		* A QSTileService provides the user a tile that can be added to Quick Settings.
		* A TileService provides the user a tile that can be added to Quick Settings.
		* Quick Settings is a space provided that allows the user to change settings and
		* take quick actions without leaving the context of their current app.
		*
		* <p>The lifecycle of a QSTileService is different from some other services in
		* <p>The lifecycle of a TileService is different from some other services in
		* that it may be unbound during parts of its lifecycle. Any of the following
		* lifecycle events can happen indepently in a separate binding/creation of the
		* service.</p>
		*
		* <ul>
		* <li>When a tile is added by the user its QSTileService will be bound to and
		* <li>When a tile is added by the user its TileService will be bound to and
		* {@link #onTileAdded()} will be called.</li>
		*
		* <li>When a tile should be up to date and listing will be indicated by
		@@ -45,10 +45,10 @@ import android.view.WindowManager;
		* <li>When the user removes a tile from Quick Settings {@link #onStopListening()}
		* will be called.</li>
		* </ul>
		* <p>QSTileService will be detected by tiles that match the {@value #ACTION_QS_TILE}
		* <p>TileService will be detected by tiles that match the {@value #ACTION_QS_TILE}
		* and require the permission "android.permission.BIND_QUICK_SETTINGS_TILE".
		* The label and icon for the service will be used as the default label and
		* icon for the tile. Here is an example QSTileService declaration.</p>
		* icon for the tile. Here is an example TileService declaration.</p>
		* <pre class="prettyprint">
		* {@literal
		* <service
		@@ -67,7 +67,7 @@ import android.view.WindowManager;
		public class TileService extends Service {

		/**
		* Action that identifies a Service as being a QSTileService.
		* Action that identifies a Service as being a TileService.
		*/
		public static final String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";

core/java/com/android/internal/logging/MetricsLogger.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ public class MetricsLogger implements MetricsConstants {
		public static final int NOTIFICATION_TOPIC_NOTIFICATION = 263;
		public static final int ACTION_DEFAULT_SMS_APP_CHANGED = 264;
		public static final int QS_COLOR_MATRIX = 265;
		public static final int QS_CUSTOM = 266;

		/**
		* Logged when the user docks a window from recents by longpressing a task and dragging it to

core/res/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1901,7 +1901,7 @@

		<!-- Allows an application to bind to third party quick settings tiles.
		<p>Should only be requested by the System, should be required by
		QSTileService declarations.-->
		TileService declarations.-->
		<permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE"
		android:protectionLevel="signature" />

packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ import android.view.View;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSPanel;
		import com.android.systemui.qs.QSTile;
		import com.android.systemui.qs.QSTileServiceWrapper;
		import com.android.systemui.qs.tiles.CustomTile;
		import com.android.systemui.qs.external.QSTileServiceWrapper;
		import com.android.systemui.qs.external.CustomTile;
		import com.android.systemui.statusbar.phone.QSTileHost;
		import com.android.systemui.tuner.TunerService;

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import android.widget.TextView;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSTile;
		import com.android.systemui.qs.QSTile.Icon;
		import com.android.systemui.qs.tiles.CustomTile;
		import com.android.systemui.qs.external.CustomTile;
		import com.android.systemui.statusbar.phone.QSTileHost;
		import com.android.systemui.tuner.QSPagingSwitch;