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

Commit 259976cf authored by Nate Myren's avatar Nate Myren
Browse files

Use only delete icon in auto revoke screen 

Do not use the disable icon in the auto revoke screen, only the delete.
Keep the disable dialog the same

Bug: 154355273
Test: Go to auto revoke screen, where a preinstalled app has been unused
for over 30 days. It should have a trash can icon, not a circle with a
diagonal line.

Change-Id: I6c4ae40b005a221e7d9a0ff51663fd54ad52c633
parent 3dd0e425

src/com/android/permissioncontroller/permission/ui/handheld/AutoRevokeFragment.kt

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ class AutoRevokeFragment : PermissionsFrameFragment() { 
                }



                if (shouldDisable) {

                    pref.removeIcon = resources.getDrawable(R.drawable.ic_settings_disable)

                    pref.removeClickListener = View.OnClickListener {

                        createDisableDialog(pkgName, user)

                    }

src/com/android/permissioncontroller/permission/ui/handheld/AutoRevokePermissionPreference.kt

+0 −10
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.permissioncontroller.permission.ui.handheld 


import android.app.Application

import android.content.Context

import android.graphics.drawable.Drawable

import android.os.UserHandle

import android.view.View

import android.widget.ImageButton
@@ -43,11 +42,6 @@ class AutoRevokePermissionPreference( 
    private var openButton: ImageButton? = null

    private var removeButton: ImageButton? = null



    var removeIcon: Drawable? = null

        set(value) {

            removeButton?.setImageDrawable(removeIcon)

            field = value

        }

    var openClickListener: View.OnClickListener? = null

        set(listener) {

            openButton?.setOnClickListener(listener)
@@ -77,9 +71,5 @@ class AutoRevokePermissionPreference( 


        removeButton = holder.findViewById(R.id.uninstall_button) as ImageButton

        removeButton?.setOnClickListener(removeClickListener)



        removeIcon?.let { icon ->

            removeButton?.setImageDrawable(icon)

        }

    }

}
 
 No newline at end of file