summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgismo2004 <reumuellermarkus@gmail.com>2017-04-02 15:11:54 +0200
committerDan Pasanen <dan.pasanen@gmail.com>2017-04-25 14:53:20 +0000
commit1cc5cef42654a6e5545e16ae4c8b2f858d701bf7 (patch)
treeab0834adbcc2d83556b1f8a2d958bab171b944eb
parentaed0d6455894a2cb909a86c6483a8452131a359f (diff)
downloadandroid_packages_apps_Trebuchet-1cc5cef42654a6e5545e16ae4c8b2f858d701bf7.tar.gz
android_packages_apps_Trebuchet-1cc5cef42654a6e5545e16ae4c8b2f858d701bf7.tar.bz2
android_packages_apps_Trebuchet-1cc5cef42654a6e5545e16ae4c8b2f858d701bf7.zip
Trebuchet: use normalized strings for sorting into bucket
converts letters like \u00c4,\u00d6,\u00dc to A,O,U Change-Id: Ie15d2bf9e1212f5e90b27359032503f641f664a4
-rw-r--r--src/com/android/launcher3/compat/AlphabeticIndexCompat.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/AlphabeticIndexCompat.java b/src/com/android/launcher3/compat/AlphabeticIndexCompat.java
index c6135e19b..0d249c083 100644
--- a/src/com/android/launcher3/compat/AlphabeticIndexCompat.java
+++ b/src/com/android/launcher3/compat/AlphabeticIndexCompat.java
@@ -5,6 +5,7 @@ import com.android.launcher3.Utilities;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.text.Normalizer;
import java.util.Locale;
/**
@@ -32,7 +33,9 @@ class BaseAlphabeticIndex {
if (s.isEmpty()) {
return UNKNOWN_BUCKET_INDEX;
}
- int index = BUCKETS.indexOf(s.substring(0, 1).toUpperCase());
+ String asciiName = Normalizer.normalize(s, Normalizer.Form.NFD)
+ .replaceAll("[^\\p{ASCII}]", "");
+ int index = BUCKETS.indexOf(asciiName.substring(0, 1).toUpperCase());
if (index != -1) {
return index;
}