summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Wingrove <simonjw@google.com>2023-03-10 14:34:48 +0000
committerSimon Wingrove <simonjw@google.com>2023-03-10 15:07:07 +0000
commit5b93d37addeee6055b5b6e07348ef6b2599baa60 (patch)
tree5ecdb4d49de98751170db9f277d78206056e8635
parent89cfdfe951517df1468bf1b3347a051e33fef17d (diff)
downloadPermission-5b93d37addeee6055b5b6e07348ef6b2599baa60.tar.gz
Use IS_FROM_SLICE extra on accessibility intent
The slices UX in settings is designed for deep links from slices, where settings deeplinks are fired from within settings. This is the same UX that SafetyCenterSources follows, so by setting this Intent we use the same experience that settings team designs for these internal deeplinks. Test: manually Test: atest PermissionControllerMockingTests CtsPermissionTestCases Relnote: N/A Bug: 258188750 Change-Id: I47aff634e5f0ab6ff02f182fc5291b9d4ea1c107
-rw-r--r--PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt6
1 files changed, 6 insertions, 0 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt b/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
index 1fe1efc6a..fa600baa9 100644
--- a/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
@@ -416,6 +416,11 @@ class AccessibilitySourceService(
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
intent.putExtra(Constants.EXTRA_SESSION_ID, sessionId)
intent.putExtra(Intent.EXTRA_UID, uid)
+
+ // Start this Settings activity using the same UX that settings slices uses. This allows
+ // settings to correctly support 2-pane layout with as-best-as-possible transition
+ // animation.
+ intent.putExtra(EXTRA_IS_FROM_SLICE, true)
return PendingIntent.getActivity(
context,
0,
@@ -644,6 +649,7 @@ class AccessibilitySourceService(
private const val PROPERTY_SC_ACCESSIBILITY_JOB_INTERVAL_MILLIS =
"sc_accessibility_job_interval_millis"
private val DEFAULT_SC_ACCESSIBILITY_JOB_INTERVAL_MILLIS = TimeUnit.DAYS.toMillis(1)
+ private val EXTRA_IS_FROM_SLICE = "is_from_slice"
private val sourceStateChanged = SafetyEvent.Builder(
SafetyEvent.SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED).build()