* Output: Nothing. *
+ *+ * This requires {@link android.Manifest.permission#GRANT_RUNTIME_PERMISSIONS} permission. + *
* * @see #EXTRA_PERMISSION_NAME * @see #EXTRA_PERMISSION_GROUP_NAME @@ -2086,10 +2089,34 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SystemApi + @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_REVIEW_PERMISSION_USAGE = "android.intent.action.REVIEW_PERMISSION_USAGE"; + /** + * Activity action: Launch UI to review ongoing app uses of permissions. + *+ * Input: {@link #EXTRA_DURATION_MILLIS} specifies the minimum number of milliseconds of recent + * activity to show (optional). Must be non-negative. + *
+ *+ * Output: Nothing. + *
+ *+ * This requires {@link android.Manifest.permission#GRANT_RUNTIME_PERMISSIONS} permission. + *
+ * + * @see #EXTRA_DURATION_MILLIS + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_REVIEW_ONGOING_PERMISSION_USAGE = + "android.intent.action.REVIEW_ONGOING_PERMISSION_USAGE"; + /** * Activity action: Launch UI to review uses of permissions for a single app. *
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
deleted file mode 100644
index cf170187cdaa9..0000000000000
--- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2018 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 com.android.systemui.privacy
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.ColorStateList
-import android.os.UserHandle
-import android.provider.Settings
-import android.util.IconDrawableFactory
-import android.util.StatsLog
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.android.systemui.Dependency
-import com.android.systemui.R
-import com.android.systemui.plugins.ActivityStarter
-import java.util.concurrent.TimeUnit
-
-class OngoingPrivacyDialog constructor(
- private val context: Context,
- private val dialogBuilder: PrivacyDialogBuilder
-) {
-
- private val iconSize = context.resources.getDimensionPixelSize(
- R.dimen.ongoing_appops_dialog_icon_size)
- private val iconColor = context.resources.getColor(
- com.android.internal.R.color.text_color_primary, context.theme)
- private val iconMargin = context.resources.getDimensionPixelSize(
- R.dimen.ongoing_appops_dialog_icon_margin)
- private val iconFactory = IconDrawableFactory.newInstance(context, true)
- private var dismissDialog: (() -> Unit)? = null
- private val appsAndTypes = dialogBuilder.appsAndTypes
- .sortedWith(compareBy({ -it.second.size }, // Sort by number of AppOps
- { it.second.min() },
- { it.first }))
-
- fun createDialog(): Dialog {
- val builder = AlertDialog.Builder(context).apply {
- setPositiveButton(R.string.ongoing_privacy_dialog_ok,
- object : DialogInterface.OnClickListener {
- override fun onClick(dialog: DialogInterface?, which: Int) {
- StatsLog.write(StatsLog.PRIVACY_INDICATORS_INTERACTED,
- StatsLog.PRIVACY_INDICATORS_INTERACTED__TYPE__DIALOG_DISMISS)
- }
- })
- setNeutralButton(R.string.ongoing_privacy_dialog_open_settings,
- object : DialogInterface.OnClickListener {
- val intent = Intent(Settings.ACTION_PRIVACY_SETTINGS).putExtra(
- Intent.EXTRA_DURATION_MILLIS, TimeUnit.MINUTES.toMillis(1))
-
- @Suppress("DEPRECATION")
- override fun onClick(dialog: DialogInterface?, which: Int) {
- StatsLog.write(StatsLog.PRIVACY_INDICATORS_INTERACTED, StatsLog
- .PRIVACY_INDICATORS_INTERACTED__TYPE__DIALOG_PRIVACY_SETTINGS)
- Dependency.get(ActivityStarter::class.java)
- .postStartActivityDismissingKeyguard(intent, 0)
- }
- })
- }
- builder.setView(getContentView())
- val dialog = builder.create()
- dismissDialog = dialog::dismiss
- return dialog
- }
-
- fun getContentView(): View {
- val layoutInflater = LayoutInflater.from(context)
- val contentView = layoutInflater.inflate(R.layout.ongoing_privacy_dialog_content, null)
-
- val title = contentView.findViewById(R.id.title) as TextView
- val appsList = contentView.findViewById(R.id.items_container) as LinearLayout
-
- title.setText(dialogBuilder.getDialogTitle())
-
- val numItems = appsAndTypes.size
- for (i in 0..(numItems - 1)) {
- val item = appsAndTypes[i]
- addAppItem(appsList, item.first, item.second, dialogBuilder.types.size > 1)
- }
- return contentView
- }
-
- @Suppress("DEPRECATION")
- private fun addAppItem(
- itemList: LinearLayout,
- app: PrivacyApplication,
- types: List