Merge "Fix tinting issue in manage permissions" into mnc-dev

aosp-mirror · May 26, 2015 · 0b08566 · 0b08566
2 parents c203f6e + b8fa280
commit 0b08566
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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.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 void onCreate(Bundle icicle) {
     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
@@ -64,6 +64,7 @@ public static Drawable applyTint(Context context, Drawable icon, int attr) {
         Theme theme = context.getTheme();
         TypedValue typedValue = new TypedValue();
         theme.resolveAttribute(attr, typedValue, true);
+        icon.clearColorFilter();
         icon.setTint(context.getColor(typedValue.resourceId));
         return icon;
     }