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

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

Merge "Remove + apps in Privacy Dialog"

parents b9f6344c cc951665

packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt

+0 −35
Original line number Diff line number Diff line
@@ -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

    }