Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d419c75c authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Fixes in OngoingPrivacyDialog"

parents 77f932c9 eac70d8e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2309,7 +2309,7 @@
    <string name="ongoing_privacy_dialog_ok">Got it</string>

    <!-- Action on Ongoing Privacy Dialog to open privacy hub [CHAR LIMIT=20]-->
    <string name="ongoing_privacy_dialog_open_settings">View details</string>
    <string name="ongoing_privacy_dialog_open_settings">Privacy settings</string>

    <!-- Text for item in Ongoing Privacy Dialog title when only one app is using app ops [CHAR LIMIT=NONE] -->
    <string name="ongoing_privacy_dialog_single_app_title">App using your <xliff:g id="types_list" example="camera( and location)">%s</xliff:g></string>
+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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.view.Gravity
import android.view.LayoutInflater
@@ -64,7 +65,7 @@ class OngoingPrivacyDialog constructor(
            setPositiveButton(R.string.ongoing_privacy_dialog_ok, null)
            setNeutralButton(R.string.ongoing_privacy_dialog_open_settings,
                    object : DialogInterface.OnClickListener {
                        val intent = Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE).putExtra(
                        val intent = Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS).putExtra(
                                Intent.EXTRA_DURATION_MILLIS, TimeUnit.MINUTES.toMillis(1))

                        @Suppress("DEPRECATION")