implements TileChangeListener
/**
* Custom tile is considered available if there is a default icon (obtained from PM).
- *
+ *
* It will return {@code true} before initialization, so tiles are not destroyed prematurely.
*/
@Override
@@ -262,6 +266,7 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
/**
* Update state of {@link this#mTile} from a remote {@link TileService}.
+ *
* @param tile tile populated with state to apply
*/
public void updateTileState(Tile tile) {
@@ -293,6 +298,7 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
if (tile.getStateDescription() != null || overwriteNulls) {
mTile.setStateDescription(tile.getStateDescription());
}
+ mTile.setActivityLaunchForClick(tile.getActivityLaunchForClick());
mTile.setState(tile.getState());
}
@@ -324,6 +330,7 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
mService.onStartListening();
}
} else {
+ mViewClicked = null;
mService.onStopListening();
if (mIsTokenGranted && !mIsShowingDialog) {
try {
@@ -388,6 +395,7 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
if (mTile.getState() == Tile.STATE_UNAVAILABLE) {
return;
}
+ mViewClicked = view;
try {
if (DEBUG) Log.d(TAG, "Adding token");
mWindowManager.addWindowToken(mToken, TYPE_QS_DIALOG, DEFAULT_DISPLAY,
@@ -400,7 +408,12 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
mServiceManager.setBindRequested(true);
mService.onStartListening();
}
- mService.onClick(mToken);
+
+ if (mTile.getActivityLaunchForClick() != null) {
+ startActivityAndCollapse(mTile.getActivityLaunchForClick());
+ } else {
+ mService.onClick(mToken);
+ }
} catch (RemoteException e) {
// Called through wrapper, won't happen here.
}
@@ -483,6 +496,27 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
});
}
+ /**
+ * Starts an {@link android.app.Activity}
+ * @param pendingIntent A PendingIntent for an Activity to be launched immediately.
+ */
+ public void startActivityAndCollapse(PendingIntent pendingIntent) {
+ if (!pendingIntent.isActivity()) {
+ Log.i(TAG, "Intent not for activity.");
+ } else if (!mIsTokenGranted) {
+ Log.i(TAG, "Launching activity before click");
+ } else {
+ Log.i(TAG, "The activity is starting");
+ ActivityLaunchAnimator.Controller controller = mViewClicked == null
+ ? null
+ : ActivityLaunchAnimator.Controller.fromView(mViewClicked, 0);
+ mUiHandler.post(() ->
+ mActivityStarter.startPendingIntentDismissingKeyguard(
+ pendingIntent, null, controller)
+ );
+ }
+ }
+
public static String toSpec(ComponentName name) {
return PREFIX + name.flattenToShortString() + ")";
}
@@ -509,8 +543,8 @@ public class CustomTile extends QSTileImpl implements TileChangeListener
/**
* Create a {@link CustomTile} for a given spec and user.
*
- * @param builder including injected common dependencies.
- * @param spec as provided by {@link CustomTile#toSpec}
+ * @param builder including injected common dependencies.
+ * @param spec as provided by {@link CustomTile#toSpec}
* @param userContext context for the user that is creating this tile.
* @return a new {@link CustomTile}
*/
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
index 5d03da3cc113b..3d48fd109e393 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
@@ -15,6 +15,7 @@
*/
package com.android.systemui.qs.external;
+import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageInfo;
@@ -32,6 +33,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.android.internal.statusbar.StatusBarIcon;
import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -275,6 +277,19 @@ public class TileServices extends IQSService.Stub {
}
}
+ @Override
+ public void startActivity(IBinder token, PendingIntent pendingIntent) {
+ startActivity(getTileForToken(token), pendingIntent);
+ }
+
+ @VisibleForTesting
+ protected void startActivity(CustomTile customTile, PendingIntent pendingIntent) {
+ if (customTile != null) {
+ verifyCaller(customTile);
+ customTile.startActivityAndCollapse(pendingIntent);
+ }
+ }
+
@Override
public void updateStatusIcon(IBinder token, Icon icon, String contentDescription) {
CustomTile customTile = getTileForToken(token);
@@ -336,7 +351,7 @@ public class TileServices extends IQSService.Stub {
}
@Nullable
- private CustomTile getTileForToken(IBinder token) {
+ public CustomTile getTileForToken(IBinder token) {
synchronized (mServices) {
return mTokenMap.get(token);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt
index f3fcdbf329b9f..2bd068a674ae1 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt
@@ -16,6 +16,7 @@
package com.android.systemui.qs.external
+import android.app.PendingIntent
import android.content.ComponentName
import android.content.Context
import android.content.pm.ApplicationInfo
@@ -30,8 +31,10 @@ import android.test.suitebuilder.annotation.SmallTest
import android.testing.AndroidTestingRunner
import android.testing.TestableLooper
import android.view.IWindowManager
+import android.view.View
import com.android.internal.logging.MetricsLogger
import com.android.systemui.SysuiTestCase
+import com.android.systemui.animation.ActivityLaunchAnimator
import com.android.systemui.classifier.FalsingManagerFake
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.plugins.qs.QSTile
@@ -39,8 +42,11 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController
import com.android.systemui.qs.QSHost
import com.android.systemui.qs.logging.QSLogger
import com.android.systemui.util.mockito.any
+import com.android.systemui.util.mockito.eq
+import com.android.systemui.util.mockito.nullable
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
+import org.junit.Assert.assertThrows
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
@@ -236,6 +242,10 @@ class CustomTileTest : SysuiTestCase() {
`when`(tile.qsTile.icon.loadDrawable(any(Context::class.java)))
.thenReturn(mock(Drawable::class.java))
+ val pi = mock(PendingIntent::class.java)
+ `when`(pi.isActivity).thenReturn(true)
+ tile.qsTile.activityLaunchForClick = pi
+
tile.refreshState()
testableLooper.processAllMessages()
@@ -289,4 +299,52 @@ class CustomTileTest : SysuiTestCase() {
assertFalse(tile.isAvailable)
verify(tileHost).removeTile(tile.tileSpec)
}
+
+ @Test
+ fun testInvalidPendingIntentDoesNotStartActivity() {
+ val pi = mock(PendingIntent::class.java)
+ `when`(pi.isActivity).thenReturn(false)
+ val tile = CustomTile.create(customTileBuilder, TILE_SPEC, mContext)
+
+ assertThrows(IllegalArgumentException::class.java) {
+ tile.qsTile.activityLaunchForClick = pi
+ }
+
+ tile.handleClick(mock(View::class.java))
+ testableLooper.processAllMessages()
+
+ verify(activityStarter, never())
+ .startPendingIntentDismissingKeyguard(
+ any(), any(), any(ActivityLaunchAnimator.Controller::class.java))
+ }
+
+ @Test
+ fun testValidPendingIntentWithNoClickDoesNotStartActivity() {
+ val pi = mock(PendingIntent::class.java)
+ `when`(pi.isActivity).thenReturn(true)
+ val tile = CustomTile.create(customTileBuilder, TILE_SPEC, mContext)
+ tile.qsTile.activityLaunchForClick = pi
+
+ testableLooper.processAllMessages()
+
+ verify(activityStarter, never())
+ .startPendingIntentDismissingKeyguard(
+ any(), any(), any(ActivityLaunchAnimator.Controller::class.java))
+ }
+
+ @Test
+ fun testValidPendingIntentStartsActivity() {
+ val pi = mock(PendingIntent::class.java)
+ `when`(pi.isActivity).thenReturn(true)
+ val tile = CustomTile.create(customTileBuilder, TILE_SPEC, mContext)
+ tile.qsTile.activityLaunchForClick = pi
+
+ tile.handleClick(mock(View::class.java))
+
+ testableLooper.processAllMessages()
+
+ verify(activityStarter)
+ .startPendingIntentDismissingKeyguard(
+ eq(pi), nullable(), nullable())
+ }
}
\ No newline at end of file
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java
index 25c95ef58d850..172c87f0c50b6 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Intent;
import android.os.Handler;
@@ -58,6 +59,7 @@ import com.android.systemui.tuner.TunerService;
import com.android.systemui.util.settings.SecureSettings;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -245,6 +247,32 @@ public class TileServicesTest extends SysuiTestCase {
verify(manager.getTileService()).onStartListening();
}
+ @Test
+ public void testValidCustomTileStartsActivity() {
+ CustomTile tile = mock(CustomTile.class);
+ PendingIntent pi = mock(PendingIntent.class);
+ ComponentName componentName = mock(ComponentName.class);
+ when(tile.getComponent()).thenReturn(componentName);
+ when(componentName.getPackageName()).thenReturn(this.getContext().getPackageName());
+
+ mTileService.startActivity(tile, pi);
+
+ verify(tile).startActivityAndCollapse(pi);
+ }
+
+ @Test
+ public void testInvalidCustomTileDoesNotStartActivity() {
+ CustomTile tile = mock(CustomTile.class);
+ PendingIntent pi = mock(PendingIntent.class);
+ ComponentName componentName = mock(ComponentName.class);
+ when(tile.getComponent()).thenReturn(componentName);
+ when(componentName.getPackageName()).thenReturn("invalid.package.name");
+
+ Assert.assertThrows(SecurityException.class, () -> mTileService.startActivity(tile, pi));
+
+ verify(tile, never()).startActivityAndCollapse(pi);
+ }
+
private class TestTileServices extends TileServices {
TestTileServices(QSTileHost host, Provider handlerProvider,
BroadcastDispatcher broadcastDispatcher, UserTracker userTracker,