diff options
| author | 2021-03-04 23:37:54 +0000 | |
|---|---|---|
| committer | 2021-03-04 23:37:54 +0000 | |
| commit | 7102d06f9e912a89960459a58d82bd4821a65a4c (patch) | |
| tree | b57060142eb0d9b0e35d13026ce1686aad4c18b4 | |
| parent | ff72e2b54abb0162d0fd2aeea093746f761b3232 (diff) | |
| parent | fd089fb2b42238c5852728d93cdaa3d67c8b03d1 (diff) | |
Merge "Add animation to PrivacyDialog" into sc-dev
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 2d202fb45bbc..ec26b8d7a6a8 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -608,6 +608,11 @@ <item name="android:windowCloseOnTouchOutside">true</item> </style> + <!-- Privacy dialog --> + <style name="PrivacyDialog" parent="ScreenRecord"> + <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> + </style> + <!-- USB Contaminant dialog --> <style name ="USBContaminant" /> diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt index 7679d4825475..8ec9b682ffdc 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt @@ -47,7 +47,7 @@ class PrivacyDialog( context: Context, private val list: List<PrivacyElement>, activityStarter: (String, Int) -> Unit -) : SystemUIDialog(context, R.style.ScreenRecord) { +) : SystemUIDialog(context, R.style.PrivacyDialog) { private val dismissListeners = mutableListOf<WeakReference<OnDialogDismissed>>() private val dismissed = AtomicBoolean(false) |