Display grayed usage data icon for methods with no usage data

Closes #878
M66B · Dec 28, 2013 · 660db4f · 660db4f
1 parent d128849
commit 660db4f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Test and beta releases will have experimental functions enabled by default.
 **Next release**
 
 * Notify action for application settings ([issue](https://github.com/M66B/XPrivacy/issues/955))
+* Display grayed usage data icon for methods with no usage data ([issue](https://github.com/M66B/XPrivacy/issues/878))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

diff --git a/res/drawable/used_holo_dark_grayed.png b/res/drawable/used_holo_dark_grayed.png
diff --git a/res/drawable/used_holo_light_grayed.png b/res/drawable/used_holo_light_grayed.png
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
@@ -6,6 +6,7 @@
         <item name="icon_info">@drawable/info_holo_dark</item>
         <item name="icon_internet">@drawable/internet_holo_dark</item>
         <item name="icon_used">@drawable/used_holo_dark</item>
+        <item name="icon_used_grayed">@drawable/used_holo_dark_grayed</item>
         <item name="icon_system">@drawable/system_holo_dark</item>
         <item name="icon_expander_minimized">@drawable/expander_ic_minimized_holo_dark</item>
         <item name="icon_expander_maximized">@drawable/expander_ic_maximized_holo_dark</item>
@@ -31,6 +32,7 @@
         <item name="icon_info">@drawable/info_holo_light</item>
         <item name="icon_internet">@drawable/internet_holo_light</item>
         <item name="icon_used">@drawable/used_holo_light</item>
+        <item name="icon_used_grayed">@drawable/used_holo_light_grayed</item>
         <item name="icon_system">@drawable/system_holo_light</item>
         <item name="icon_expander_minimized">@drawable/expander_ic_minimized_holo_light</item>
         <item name="icon_expander_maximized">@drawable/expander_ic_maximized_holo_light</item>

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
@@ -8,6 +8,7 @@
     <attr name="icon_info" format="reference" />
     <attr name="icon_internet" format="reference" />
     <attr name="icon_used" format="reference" />
+    <attr name="icon_used_grayed" format="reference" />
     <attr name="icon_system" format="reference" />
     <attr name="icon_user" format="reference" />
     <attr name="icon_user_system" format="reference" />

diff --git a/src/biz/bokhorst/xprivacy/ActivityApp.java b/src/biz/bokhorst/xprivacy/ActivityApp.java
@@ -1334,7 +1334,10 @@ protected void onPostExecute(Object result) {
 						holder.ctvMethodName.setText(String.format("%s (%s)", md.getName(), sLastUsage));
 					}
 					holder.ctvMethodName.setEnabled(parentRestricted);
-					holder.imgUsed.setVisibility(lastUsage == 0 ? View.INVISIBLE : View.VISIBLE);
+					holder.imgUsed.setImageResource(Util.getThemed(ActivityApp.this,
+							md.hasNoUsageData() ? R.attr.icon_used_grayed : R.attr.icon_used));
+					holder.imgUsed
+							.setVisibility(lastUsage == 0 && !md.hasNoUsageData() ? View.INVISIBLE : View.VISIBLE);
 					holder.ctvMethodName.setTypeface(null, lastUsage == 0 ? Typeface.NORMAL : Typeface.BOLD_ITALIC);
 					holder.imgGranted.setVisibility(permission ? View.VISIBLE : View.INVISIBLE);
 					holder.ctvMethodName.setChecked(restricted);

diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -1288,6 +1288,10 @@ public boolean isRestartRequired() {
 			return mRestart;
 		}
 
+		public boolean hasNoUsageData() {
+			return isRestartRequired();
+		}
+
 		public String[] getPermissions() {
 			return mPermissions;
 		}