Get working on CM12

Change-Id: Id9d08836456685912b5f75a1acd0a8992e8b6b47

18 files changed, 26 insertions, 68 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 315f67b..4b6d543 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,6 +44,8 @@
                   android:screenOrientation="sensorPortrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/component_selector.xml b/res/layout/component_selector.xml
index 64c1dde..7c2bd53 100644
--- a/res/layout/component_selector.xml
+++ b/res/layout/component_selector.xml
@@ -30,5 +30,5 @@
 
     <com.cyngn.theme.widget.NavBarSpace
         android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/system_bar_height"/>
+        android:layout_height="@*android:dimen/navigation_bar_height"/>
 </com.cyngn.theme.chooser.ComponentSelector>
\ No newline at end of file
diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml
index ccc301a..5e30f13 100644
--- a/res/layout/fragment_pager_list.xml
+++ b/res/layout/fragment_pager_list.xml
@@ -198,7 +198,7 @@
 
                 <com.cyngn.theme.widget.NavBarSpace
                     android:layout_width="match_parent"
-                    android:layout_height="@*android:dimen/system_bar_height" />
+                    android:layout_height="@*android:dimen/navigation_bar_height" />
             </LinearLayout>
         </LinearLayout>
     </com.cyngn.theme.widget.LockableScrollView>
diff --git a/res/layout/navbar_card.xml b/res/layout/navbar_card.xml
index 6b19a24..bc95df0 100644
--- a/res/layout/navbar_card.xml
+++ b/res/layout/navbar_card.xml
@@ -27,7 +27,7 @@
             android:id="@+id/navigation_bar"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="@*android:dimen/system_bar_height"
+            android:layout_height="@*android:dimen/navigation_bar_height"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:background="#000">
diff --git a/res/layout/save_apply_button.xml b/res/layout/save_apply_button.xml
index 14ef286..c1791f1 100644
--- a/res/layout/save_apply_button.xml
+++ b/res/layout/save_apply_button.xml
@@ -32,6 +32,6 @@
 
     <com.cyngn.theme.widget.NavBarSpace
         android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/system_bar_height"/>
+        android:layout_height="@*android:dimen/navigation_bar_height"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/shop_themes.xml b/res/layout/shop_themes.xml
index dc8603c..cff413f 100644
--- a/res/layout/shop_themes.xml
+++ b/res/layout/shop_themes.xml
@@ -28,5 +28,5 @@
 
     <com.cyngn.theme.widget.NavBarSpace
         android:layout_width="match_parent"
-        android:layout_height="@*android:dimen/system_bar_height"/>
+        android:layout_height="@*android:dimen/navigation_bar_height"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a36585f..b13a008 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,7 +62,7 @@
     <dimen name="apply_progress_padding">10dp</dimen>
     <dimen name="apply_progress_height">24dp</dimen>
 
-    <dimen name="system_bar_height">@*android:dimen/system_bar_height</dimen>
+    <dimen name="system_bar_height">@*android:dimen/navigation_bar_height</dimen>
     <dimen name="expand_collapse_child_offset">12dp</dimen>
 
     <dimen name="shop_themes_margin_bottom">24dp</dimen>
diff --git a/src/com/cyngn/theme/chooser/AppReceiver.java b/src/com/cyngn/theme/chooser/AppReceiver.java
index 920dc4d..4edb41b 100644
--- a/src/com/cyngn/theme/chooser/AppReceiver.java
+++ b/src/com/cyngn/theme/chooser/AppReceiver.java
@@ -74,14 +74,8 @@ public class AppReceiver extends BroadcastReceiver {
 
     private boolean isTheme(Context context, String pkgName) throws NameNotFoundException {
         PackageInfo pi = context.getPackageManager().getPackageInfo(pkgName, 0);
-        if (pi == null) return false;
 
-        if ((pi.themeInfos != null && pi.themeInfos.length > 0) ||
-                (pi.legacyThemeInfos != null && pi.legacyThemeInfos.length > 0)) {
-            return true;
-        }
-
-        return false;
+        return pi != null && pi.themeInfo != null;
     }
 
     private boolean isThemeBeingProcessed(Context context, String pkgName) {
diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java
index d8a5f89..5158230 100644
--- a/src/com/cyngn/theme/chooser/ChooserActivity.java
+++ b/src/com/cyngn/theme/chooser/ChooserActivity.java
@@ -70,7 +70,7 @@ public class ChooserActivity extends FragmentActivity
     public static final String THEME_STORE_PACKAGE = "com.cyngn.themestore";
     private static final String TAG = ChooserActivity.class.getSimpleName();
 
-    public static final String DEFAULT = ThemeConfig.HOLO_DEFAULT;
+    public static final String DEFAULT = ThemeConfig.SYSTEM_DEFAULT;
     public static final String EXTRA_PKGNAME = "pkgName";
     public static final String EXTRA_COMPONENTS = "components";
 
diff --git a/src/com/cyngn/theme/chooser/ComponentSelector.java b/src/com/cyngn/theme/chooser/ComponentSelector.java
index 1cfe364..27ff13e 100644
--- a/src/com/cyngn/theme/chooser/ComponentSelector.java
+++ b/src/com/cyngn/theme/chooser/ComponentSelector.java
@@ -114,8 +114,7 @@ public class ComponentSelector extends LinearLayout
 
         mContext = context;
         mInflater = LayoutInflater.from(context);
-        mBatteryStyle = Settings.System.getInt(context.getContentResolver(),
-                Settings.System.STATUS_BAR_BATTERY, 0);
+        mBatteryStyle = 0;
 
         mAnimateIn = AnimationUtils.loadAnimation(mContext,
                 R.anim.component_selection_animate_in);
diff --git a/src/com/cyngn/theme/chooser/MyThemeFragment.java b/src/com/cyngn/theme/chooser/MyThemeFragment.java
index 3ccb8d2..14aca3b 100644
--- a/src/com/cyngn/theme/chooser/MyThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/MyThemeFragment.java
@@ -35,6 +35,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.cyngn.theme.chooser.ThemeFragment;
 import com.cyngn.theme.util.AudioUtils;
 import com.cyngn.theme.util.PreferenceUtils;
 import com.cyngn.theme.util.ThemedTypefaceHelper;
@@ -388,7 +389,7 @@ public class MyThemeFragment extends ThemeFragment {
             String currentPkg = mCurrentTheme.get(component);
             String selectedPkg = mSelectedComponentsMap.get(component);
             if (selectedPkg != null && !currentPkg.equals(selectedPkg)) {
-                componentsToApply.put(component, selectedPkg);
+                componentsToApply.put(selectedPkg, component);
             }
         }
         return componentsToApply;
diff --git a/src/com/cyngn/theme/chooser/NotificationHijackingService.java b/src/com/cyngn/theme/chooser/NotificationHijackingService.java
index a83f2e8..ca53791 100644
--- a/src/com/cyngn/theme/chooser/NotificationHijackingService.java
+++ b/src/com/cyngn/theme/chooser/NotificationHijackingService.java
@@ -34,8 +34,7 @@ public class NotificationHijackingService extends NotificationListenerService {
                 try {
                     PackageInfo pi = getPackageManager().getPackageInfo(pkgName, 0);
                     if (pi != null) {
-                        if ((pi.themeInfos != null && pi.themeInfos.length > 0) ||
-                                (pi.legacyThemeInfos != null && pi.legacyThemeInfos.length > 0)) {
+                        if (pi.themeInfo != null) {
                             cancelNotification(GOOGLE_PLAY_PACKAGE_NAME, sbn.getTag(), sbn.getId());
                         }
                     }
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index ea33a8c..bd18370 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -294,8 +294,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         final Context context = getActivity();
         mPkgName = getArguments().getString(ARG_PACKAGE_NAME);
         mSkipLoadingAnim = getArguments().getBoolean(ARG_SKIP_LOADING_ANIM);
-        mBatteryStyle = Settings.System.getInt(context.getContentResolver(),
-                Settings.System.STATUS_BAR_BATTERY, 0);
+        mBatteryStyle = 0;
 
         getIconComponents(context);
         if (sTypefaceHelperCache == null) {
@@ -390,7 +389,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
                 Menu menu = popupmenu.getMenu();
                 if (CURRENTLY_APPLIED_THEME.equals(mPkgName) ||
                         mPkgName.equals(ThemeUtils.getDefaultThemePackageName(getActivity())) ||
-                        mPkgName.equals(ThemeConfig.HOLO_DEFAULT)) {
+                        mPkgName.equals(ThemeConfig.SYSTEM_DEFAULT)) {
                     menu.findItem(R.id.menu_delete).setEnabled(false);
                 }
                 if (!mThemeTagLayout.isCustomizedTagEnabled()) {
@@ -423,7 +422,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
             }
         });
         if (ThemeUtils.getDefaultThemePackageName(getActivity()).equals(mPkgName) ||
-                ThemeConfig.HOLO_DEFAULT.equals(mPkgName)) {
+                ThemeConfig.SYSTEM_DEFAULT.equals(mPkgName)) {
             mDelete.setVisibility(View.GONE);
         }
 
@@ -1000,7 +999,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         Point p = new Point();
         display.getSize(p);
         int heightId = getResources()
-                .getIdentifier("system_bar_height", "dimen", "android");
+                .getIdentifier("navigation_bar_height", "dimen", "android");
         int navbar_height = getResources().getDimensionPixelSize(heightId);
         int[] pos = new int[2];
         v.getLocationInWindow(pos);
@@ -2606,7 +2605,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
                 return Boolean.FALSE;
             }
             ZipFile zip = null;
-            if (ThemeConfig.HOLO_DEFAULT.equals(mPkgName)) {
+            if (ThemeConfig.SYSTEM_DEFAULT.equals(mPkgName)) {
                 try {
                     zip = new ZipFile(new File(BootAnimationHelper.SYSTEM_BOOT_ANI_PATH));
                 } catch (Exception e) {
diff --git a/src/com/cyngn/theme/util/AudioUtils.java b/src/com/cyngn/theme/util/AudioUtils.java
index 3899342..629232a 100644
--- a/src/com/cyngn/theme/util/AudioUtils.java
+++ b/src/com/cyngn/theme/util/AudioUtils.java
@@ -23,16 +23,12 @@ public class AudioUtils {
 
     public static void loadThemeAudible(Context context, int type, String pkgName, MediaPlayer mp)
             throws PackageManager.NameNotFoundException {
-        if (ThemeConfig.HOLO_DEFAULT.equals(pkgName)) {
+        if (ThemeConfig.SYSTEM_DEFAULT.equals(pkgName)) {
             loadSystemAudible(type, mp);
             return;
         }
         PackageInfo pi = context.getPackageManager().getPackageInfo(pkgName, 0);
         Context themeCtx = context.createPackageContext(pkgName, 0);
-        if (pi.isLegacyThemeApk) {
-            loadLegacyThemeAudible(themeCtx, type, pi, mp);
-            return;
-        }
         AssetManager assetManager = themeCtx.getAssets();
         String assetPath;
         switch (type) {
@@ -68,38 +64,6 @@ public class AudioUtils {
         }
     }
 
-    public static void loadLegacyThemeAudible(Context themeCtx, int type, PackageInfo pi,
-            MediaPlayer mp) {
-        if (pi.legacyThemeInfos == null || pi.legacyThemeInfos.length == 0)
-            return;
-        AssetManager assetManager = themeCtx.getAssets();
-        String assetPath;
-        switch (type) {
-            case RingtoneManager.TYPE_NOTIFICATION:
-                assetPath = pi.legacyThemeInfos[0].notificationFileName;
-                break;
-            case RingtoneManager.TYPE_RINGTONE:
-                assetPath = pi.legacyThemeInfos[0].ringtoneFileName;
-                break;
-            default:
-                assetPath = null;
-                break;
-        }
-        if (assetPath != null) {
-            try {
-                AssetFileDescriptor afd = assetManager.openFd(assetPath);
-                if (mp != null) {
-                    mp.reset();
-                    mp.setDataSource(afd.getFileDescriptor(),
-                            afd.getStartOffset(), afd.getLength());
-                    mp.prepare();
-                }
-            } catch (IOException e) {
-                Log.e(TAG, "Unable to load legacy sound for " + pi.packageName, e);
-            }
-        }
-    }
-
     public static void loadSystemAudible(int type, MediaPlayer mp) {
         final String audiblePath = ThemeUtils.getDefaultAudiblePath(type);
         if (audiblePath != null && (new File(audiblePath)).exists()) {
diff --git a/src/com/cyngn/theme/util/BootAnimationHelper.java b/src/com/cyngn/theme/util/BootAnimationHelper.java
index 589b037..283f854 100644
--- a/src/com/cyngn/theme/util/BootAnimationHelper.java
+++ b/src/com/cyngn/theme/util/BootAnimationHelper.java
@@ -268,7 +268,7 @@ public class BootAnimationHelper {
             String previewName = null;
             // this is ugly, ugly, ugly.  Did I mention this is ugly?
             try {
-                if (ThemeConfig.HOLO_DEFAULT.equals(path)) {
+                if (ThemeConfig.SYSTEM_DEFAULT.equals(path)) {
                     previewName = getPreviewFrameEntryName(
                             new FileInputStream(SYSTEM_BOOT_ANI_PATH));
                     bitmap = loadPreviewFrame(
diff --git a/src/com/cyngn/theme/util/IconPreviewHelper.java b/src/com/cyngn/theme/util/IconPreviewHelper.java
index fe00954..60ef9c8 100644
--- a/src/com/cyngn/theme/util/IconPreviewHelper.java
+++ b/src/com/cyngn/theme/util/IconPreviewHelper.java
@@ -170,7 +170,7 @@ public class IconPreviewHelper {
     private Drawable getFullResIcon(Resources resources, int iconId) {
         Drawable d;
         try {
-            d = resources.getDrawableForDensity(iconId, mIconDpi, false);
+            d = resources.getDrawableForDensity(iconId, mIconDpi, null, false);
         } catch (Resources.NotFoundException e) {
             d = null;
         }
diff --git a/src/com/cyngn/theme/util/NotificationHelper.java b/src/com/cyngn/theme/util/NotificationHelper.java
index dcdc938..c4ff73d 100644
--- a/src/com/cyngn/theme/util/NotificationHelper.java
+++ b/src/com/cyngn/theme/util/NotificationHelper.java
@@ -24,10 +24,8 @@ public class NotificationHelper {
         String themeName = null;
         try {
             PackageInfo pi = context.getPackageManager().getPackageInfo(pkgName, 0);
-            if (pi.themeInfos != null && pi.themeInfos.length > 0) {
-                themeName = pi.themeInfos[0].name;
-            } else if (pi.legacyThemeInfos != null && pi.legacyThemeInfos[0] != null) {
-                themeName = pi.legacyThemeInfos[0].name;
+            if (pi.themeInfo != null) {
+                themeName = pi.themeInfo.name;
             }
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
diff --git a/src/com/cyngn/theme/util/Utils.java b/src/com/cyngn/theme/util/Utils.java
index d7b3e89..dd41c97 100644
--- a/src/com/cyngn/theme/util/Utils.java
+++ b/src/com/cyngn/theme/util/Utils.java
@@ -289,6 +289,7 @@ public class Utils {
         final int scaledWidth = Math.round((wallpaper.getWidth() * scale));
         final int scaledHeight = Math.round((wallpaper.getHeight() * scale));
 
+        // TODO: set xOffset to wm.getLastWallpaperX() once available
         int xOffset = wm.getLastWallpaperX();
         // x offset
         if (xOffset == -1) {
@@ -298,6 +299,7 @@ public class Utils {
         }
 
         // y offsets
+        // TODO: set yOffset to wm.getLastWallpaperY() once available
         int yOffset = wm.getLastWallpaperY();
         if (yOffset == -1) {
             yOffset = 0;