From b8fa280183c0e893f194ce162ccfe8845f60e347 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 22 May 2015 11:52:38 -0400
Subject: Fix tinting issue in manage permissions

Make sure we update the ui in onResume so we have the right tinting
and make sure we clear out other tints first.

Bug: 21367016
Change-Id: I800503fff5dc0cbcf3cfd6876c78c257adc24d65
---
 .../packageinstaller/permission/ui/ManagePermissionsFragment.java      | 3 +--
 src/com/android/packageinstaller/permission/utils/Utils.java           | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
index 4437e5cf..1d7ca6d0 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
@@ -22,14 +22,12 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -73,6 +71,7 @@ public final class ManagePermissionsFragment extends PreferenceFragment
     public void onResume() {
         super.onResume();
         mPermissions.refresh();
+        updatePermissionsUi();
     }
 
     @Override
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 7bbe5982..856826d5 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -64,6 +64,7 @@ public class Utils {
         Theme theme = context.getTheme();
         TypedValue typedValue = new TypedValue();
         theme.resolveAttribute(attr, typedValue, true);
+        icon.clearColorFilter();
         icon.setTint(context.getColor(typedValue.resourceId));
         return icon;
     }
-- 
cgit v1.2.3