Merge "Animate activities launched by QS click (1/2)." into sc-dev (ff8c1e6f) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ java_library {
		],

		static_libs: [
		"androidx.annotation_annotation",
		"PluginCoreLib",
		"SystemUI-sensors",
		"SystemUIAnimationLib",

+15 −3

Original line number	Diff line number	Diff line
		@@ -15,13 +15,14 @@
		package com.android.systemui.plugins.qs;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.metrics.LogMaker;
		import android.service.quicksettings.Tile;
		import android.view.View;

		import androidx.annotation.Nullable;

		import com.android.internal.logging.InstanceId;
		import com.android.systemui.plugins.annotations.DependsOn;
		import com.android.systemui.plugins.annotations.ProvidesInterface;
		@@ -56,8 +57,19 @@ public interface QSTile {

		QSIconView createTileView(Context context);

		void click();
		void secondaryClick();
		/**
		* The tile was clicked.
		*
		* @param view The view that was clicked.
		*/
		void click(@Nullable View view);

		/**
		* The tile secondary click was triggered.
		*
		* @param view The view that was clicked.
		*/
		void secondaryClick(@Nullable View view);

		/**
		* The tile was long clicked.

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		final String spec = CustomTile.toSpec(tile);
		for (TileRecord record : mRecords) {
		if (record.tile.getTileSpec().equals(spec)) {
		record.tile.click();
		record.tile.click(null /* view */);
		break;
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -40,10 +40,12 @@ import android.text.TextUtils;
		import android.text.format.DateUtils;
		import android.util.Log;
		import android.view.IWindowManager;
		import android.view.View;
		import android.view.WindowManagerGlobal;
		import android.widget.Switch;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		@@ -311,7 +313,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener
		}

		@Override
		protected void handleClick() {
		protected void handleClick(@Nullable View view) {
		if (mTile.getState() == Tile.STATE_UNAVAILABLE) {
		return;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {

		@Override
		public void init(QSTile tile) {
		init(v -> tile.click(), v -> tile.secondaryClick(), view -> {
		init(v -> tile.click(this), v -> tile.secondaryClick(this), view -> {
		tile.longClick(this);
		return true;
		});