Merge branch 'master' of github.com:Neamar/KISS

darlaam · Aug 2, 2016 · 6379ef2 · 6379ef2
2 parents 3314842 + a63de32
commit 6379ef2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/fr/neamar/kiss/DataHandler.java b/app/src/main/java/fr/neamar/kiss/DataHandler.java
@@ -369,7 +369,7 @@ public void removeShortcuts(String packageName) {
 
     public void removeFromExcluded(String packageName) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
-        String excluded = prefs.getString("excluded-apps-list", "");
+        String excluded = prefs.getString("excluded-apps-list", context.getPackageName() + ";");
         prefs.edit().putString("excluded-apps-list", excluded.replaceAll(packageName + ";", "")).apply();
     }
 

diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
@@ -24,5 +24,12 @@
         <item>alphabetical</item>
         <item>invertedAlphabetical</item>
     </string-array>
+    <string-array name="historyModeEntries">
+    	<item>Più recente per primo</item>
+    	<item>Più utilizzato per primo</item>
+    </string-array>
+    <string-array name="historyModeValues">
+    	<item>recency</item>
+    	<item>frecency</item>
+    </string-array>
 </resources>
-