diff options
| -rw-r--r-- | packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt | 35 |
2 files changed, 0 insertions, 38 deletions
diff --git a/packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml b/packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml index bc15f2c46b47..665fc3fbf3da 100644 --- a/packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml +++ b/packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml @@ -54,9 +54,6 @@ android:orientation="vertical" android:gravity="start" /> - - <include android:id="@+id/overflow" layout="@layout/ongoing_privacy_dialog_item" - android:visibility="gone" /> </LinearLayout> </LinearLayout> diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt index 75b8a056df1d..84a344648a39 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt @@ -42,14 +42,10 @@ class OngoingPrivacyDialog constructor( private val iconSize = context.resources.getDimensionPixelSize( R.dimen.ongoing_appops_dialog_icon_size) - private val plusSize = context.resources.getDimensionPixelSize( - R.dimen.ongoing_appops_dialog_app_plus_size) private val iconColor = context.resources.getColor( com.android.internal.R.color.text_color_primary, context.theme) - private val plusColor: Int private val iconMargin = context.resources.getDimensionPixelSize( R.dimen.ongoing_appops_dialog_icon_margin) - private val MAX_ITEMS = context.resources.getInteger(R.integer.ongoing_appops_dialog_max_apps) private val iconFactory = IconDrawableFactory.newInstance(context, true) private var dismissDialog: (() -> Unit)? = null private val appsAndTypes = dialogBuilder.appsAndTypes @@ -57,13 +53,6 @@ class OngoingPrivacyDialog constructor( { it.second.min() }, { it.first })) - init { - val a = context.theme.obtainStyledAttributes( - intArrayOf(com.android.internal.R.attr.colorAccent)) - plusColor = a.getColor(0, 0) - a.recycle() - } - fun createDialog(): Dialog { val builder = AlertDialog.Builder(context).apply { setPositiveButton(R.string.ongoing_privacy_dialog_ok, null) @@ -96,33 +85,9 @@ class OngoingPrivacyDialog constructor( val numItems = appsAndTypes.size for (i in 0..(numItems - 1)) { - if (i >= MAX_ITEMS) break val item = appsAndTypes[i] addAppItem(appsList, item.first, item.second, dialogBuilder.types.size > 1) } - - if (numItems > MAX_ITEMS) { - val overflow = contentView.findViewById(R.id.overflow) as LinearLayout - overflow.visibility = View.VISIBLE - val overflowText = overflow.findViewById(R.id.app_name) as TextView - overflowText.text = context.resources.getQuantityString( - R.plurals.ongoing_privacy_dialog_overflow_text, - numItems - MAX_ITEMS, - numItems - MAX_ITEMS - ) - val overflowPlus = overflow.findViewById(R.id.app_icon) as ImageView - val lp = overflowPlus.layoutParams.apply { - height = plusSize - width = plusSize - } - overflowPlus.layoutParams = lp - overflowPlus.apply { - val plus = context.getDrawable(R.drawable.plus) - imageTintList = ColorStateList.valueOf(plusColor) - setImageDrawable(plus) - } - } - return contentView } |