summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-05-26 13:10:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-26 13:10:14 +0000
commit0b085665998b69aa9543d50ecca1a5bc62d6bb77 (patch)
treea45535b1024bc2dc393f1d83ce244797acfbd47c /src
parentc203f6e13e07ca516208d2c4586ea4fc6d76a51d (diff)
parentb8fa280183c0e893f194ce162ccfe8845f60e347 (diff)
downloadandroid_packages_apps_PackageInstaller-0b085665998b69aa9543d50ecca1a5bc62d6bb77.tar.gz
android_packages_apps_PackageInstaller-0b085665998b69aa9543d50ecca1a5bc62d6bb77.tar.bz2
android_packages_apps_PackageInstaller-0b085665998b69aa9543d50ecca1a5bc62d6bb77.zip
Merge "Fix tinting issue in manage permissions" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java3
-rw-r--r--src/com/android/packageinstaller/permission/utils/Utils.java1
2 files changed, 2 insertions, 2 deletions
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;
}