Merge branch 'permission-icon-color' into 'master'

Match color of permission icons with other icon colors

See merge request fdroid/fdroidclient!607
This commit is contained in:
Hans-Christoph Steiner 2017-11-09 19:57:00 +00:00
commit 3ebb64b120

View File

@ -26,7 +26,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionGroupInfo;
import android.content.pm.PermissionInfo; import android.content.pm.PermissionInfo;
import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
@ -42,8 +41,7 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.Preferences.Theme;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import java.text.Collator; import java.text.Collator;
@ -175,9 +173,8 @@ public class AppSecurityPermissions {
label = builder; label = builder;
} }
Theme theme = Preferences.get().getTheme();
permGrpIcon.setImageDrawable(icon); permGrpIcon.setImageDrawable(icon);
permGrpIcon.setColorFilter(theme == Theme.light ? Color.BLACK : Color.WHITE); permGrpIcon.setColorFilter(0xff757575);
permNameView.setText(label); permNameView.setText(label);
setOnClickListener(this); setOnClickListener(this);
} }