eleven: cm-14.0 time

- Adds librsjni as a dependency
- Changes icu4j imports to use the public API
- Minor adjustments to internal API usage
- min/targetSDK is now 24

Change-Id: I2de170f68f9488f8e21b4c05c1c5d4518c5e8a1a

diff --git a/Android.mk b/Android.mk
index 13ec0a0..7fa08e7 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,8 @@ LOCAL_AAPT_FLAGS := \
 LOCAL_PACKAGE_NAME := Eleven
 LOCAL_OVERRIDES_PACKAGES := Music
 
 LOCAL_PACKAGE_NAME := Eleven
 LOCAL_OVERRIDES_PACKAGES := Music
 

+LOCAL_JNI_SHARED_LIBRARIES := librsjni
+

 LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.cfg
 ifeq ($(TARGET_BUILD_VARIANT),user)
     LOCAL_PROGUARD_ENABLED := obfuscation
 LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.cfg
 ifeq ($(TARGET_BUILD_VARIANT),user)
     LOCAL_PROGUARD_ENABLED := obfuscation

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca66b2e..e52f9f9 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,8 @@
     android:versionName="3.0" >
 
     <uses-sdk
     android:versionName="3.0" >
 
     <uses-sdk

-        android:minSdkVersion="22"
-        android:targetSdkVersion="22" />
+        android:minSdkVersion="24"
+        android:targetSdkVersion="24" />

 
     <!-- Used for caching and creating new playlists -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <!-- Used for caching and creating new playlists -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/src/com/cyanogenmod/eleven/locale/HanziToPinyin.java b/src/com/cyanogenmod/eleven/locale/HanziToPinyin.java
index 895bbab..a528858 100644 (file)
--- a/src/com/cyanogenmod/eleven/locale/HanziToPinyin.java
+++ b/src/com/cyanogenmod/eleven/locale/HanziToPinyin.java
@@ -21,7 +21,7 @@ import android.util.Log;
 
 import java.util.ArrayList;
 
 
 import java.util.ArrayList;
 

-import libcore.icu.Transliterator;
+import android.icu.text.Transliterator;

 
 /**
  * An object to convert Chinese character to its corresponding pinyin string.
 
 /**
  * An object to convert Chinese character to its corresponding pinyin string.


@@ -72,8 +72,8 @@ public class HanziToPinyin {
 
     private HanziToPinyin() {
         try {
 
     private HanziToPinyin() {
         try {

-            mPinyinTransliterator = new Transliterator("Han-Latin/Names; Latin-Ascii; Any-Upper");
-            mAsciiTransliterator = new Transliterator("Latin-Ascii");
+            mPinyinTransliterator = Transliterator.getInstance("Han-Latin/Names; Latin-Ascii; Any-Upper");
+            mAsciiTransliterator = Transliterator.getInstance("Latin-Ascii");

         } catch (RuntimeException e) {
             Log.w(TAG, "Han-Latin/Names transliterator data is missing,"
                     + " HanziToPinyin is disabled");
         } catch (RuntimeException e) {
             Log.w(TAG, "Han-Latin/Names transliterator data is missing,"
                     + " HanziToPinyin is disabled");

diff --git a/src/com/cyanogenmod/eleven/locale/LocaleUtils.java b/src/com/cyanogenmod/eleven/locale/LocaleUtils.java
index 4381f71..51d35ec 100644 (file)
--- a/src/com/cyanogenmod/eleven/locale/LocaleUtils.java
+++ b/src/com/cyanogenmod/eleven/locale/LocaleUtils.java
@@ -33,9 +33,9 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 
 import java.util.Locale;
 import java.util.Set;
 

-import libcore.icu.AlphabeticIndex;
-import libcore.icu.AlphabeticIndex.ImmutableIndex;
-import libcore.icu.Transliterator;
+import android.icu.text.AlphabeticIndex;
+import android.icu.text.AlphabeticIndex.ImmutableIndex;
+import android.icu.text.Transliterator;

 
 /**
  * This utility class provides specialized handling for locale specific
 
 /**
  * This utility class provides specialized handling for locale specific


@@ -108,7 +108,7 @@ public class LocaleUtils {
                 .addLabels(LOCALE_GREEK)
                 .addLabels(LOCALE_UKRAINIAN)
                 .addLabels(LOCALE_SERBIAN)
                 .addLabels(LOCALE_GREEK)
                 .addLabels(LOCALE_UKRAINIAN)
                 .addLabels(LOCALE_SERBIAN)

-                .getImmutableIndex();
+                .buildImmutableIndex();

             mAlphabeticIndexBucketCount = mAlphabeticIndex.getBucketCount();
             mNumberBucketIndex = mAlphabeticIndexBucketCount - 1;
         }
             mAlphabeticIndexBucketCount = mAlphabeticIndex.getBucketCount();
             mNumberBucketIndex = mAlphabeticIndexBucketCount - 1;
         }


@@ -190,7 +190,7 @@ public class LocaleUtils {
             } else if (bucketIndex > mNumberBucketIndex) {
                 --bucketIndex;
             }
             } else if (bucketIndex > mNumberBucketIndex) {
                 --bucketIndex;
             }

-            return mAlphabeticIndex.getBucketLabel(bucketIndex);
+            return mAlphabeticIndex.getBucket(bucketIndex).getLabel();

         }
 
         @SuppressWarnings("unused")
         }
 
         @SuppressWarnings("unused")


@@ -323,7 +323,7 @@ public class LocaleUtils {
                     mInitializedTransliterator = true;
                     Transliterator t = null;
                     try {
                     mInitializedTransliterator = true;
                     Transliterator t = null;
                     try {

-                        t = new Transliterator("Hiragana-Latin; Katakana-Latin;"
+                        t = Transliterator.getInstance("Hiragana-Latin; Katakana-Latin;"

                                 + " Latin-Ascii");
                     } catch (RuntimeException e) {
                         Log.w(TAG, "Hiragana/Katakana-Latin transliterator data"
                                 + " Latin-Ascii");
                     } catch (RuntimeException e) {
                         Log.w(TAG, "Hiragana/Katakana-Latin transliterator data"

diff --git a/src/com/cyanogenmod/eleven/utils/PopupMenuHelper.java b/src/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
index f3d1239..dffde73 100644 (file)
--- a/src/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
+++ b/src/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
@@ -349,7 +349,7 @@ public abstract class PopupMenuHelper implements PopupMenu.OnMenuItemClickListen
                             // do nothing
                         }
                     });
                             // do nothing
                         }
                     });

-                    builder.show(null, null);
+                    builder.showDialog(null, null);

                     return true;
                 case FragmentMenuItems.NEW_PLAYLIST:
                     CreateNewPlaylist.getInstance(getIdList()).show(
                     return true;
                 case FragmentMenuItems.NEW_PLAYLIST:
                     CreateNewPlaylist.getInstance(getIdList()).show(