Theme chooser for the people

Let freedom ring!

Change-Id: I12b3e6b5d46eb2e13afd841dfd5c215af64188d8
TICKET: OSS-67

37 files changed, 658 insertions, 211 deletions

diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java
index cae4d5a..ba0911e 100644
--- a/src/android/support/v4/view/ThemeViewPager.java
+++ b/src/android/support/v4/view/ThemeViewPager.java
@@ -1,6 +1,20 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package android.support.v4.view;
 
 import android.content.Context;
@@ -10,7 +24,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import com.cyngn.theme.chooser.R;
+import org.cyanogenmod.theme.chooser.R;
 
 public class ThemeViewPager extends ViewPager {
     private static final String TAG = ThemeViewPager.class.getSimpleName();
diff --git a/src/android/widget/ComponentSelectorLinearLayout.java b/src/android/widget/ComponentSelectorLinearLayout.java
index cb13ba0..17d4256 100644
--- a/src/android/widget/ComponentSelectorLinearLayout.java
+++ b/src/android/widget/ComponentSelectorLinearLayout.java
@@ -1,6 +1,20 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package android.widget;
 
 import android.content.Context;
diff --git a/src/com/viewpagerindicator/CirclePageIndicator.java b/src/com/viewpagerindicator/CirclePageIndicator.java
index 81365af..19b031e 100644
--- a/src/com/viewpagerindicator/CirclePageIndicator.java
+++ b/src/com/viewpagerindicator/CirclePageIndicator.java
@@ -34,7 +34,7 @@ import android.view.View;
 import android.view.ViewConfiguration;
 
 import au.com.glassechidna.velocityviewpager.VelocityViewPager;
-import com.cyngn.theme.chooser.R;
+import org.cyanogenmod.theme.chooser.R;
 
 import static android.graphics.Paint.ANTI_ALIAS_FLAG;
 import static android.widget.LinearLayout.HORIZONTAL;
diff --git a/src/com/cyngn/theme/chooser/AppReceiver.java b/src/org/cyanogenmod/theme/chooser/AppReceiver.java
index 4354f63..0c3037e 100644
--- a/src/com/cyngn/theme/chooser/AppReceiver.java
+++ b/src/org/cyanogenmod/theme/chooser/AppReceiver.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -11,9 +25,9 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 import android.text.TextUtils;
 
-import com.cyngn.theme.util.NotificationHelper;
-import com.cyngn.theme.util.PreferenceUtils;
-import com.cyngn.theme.util.Utils;
+import org.cyanogenmod.theme.util.NotificationHelper;
+import org.cyanogenmod.theme.util.PreferenceUtils;
+import org.cyanogenmod.theme.util.Utils;
 
 import cyanogenmod.providers.ThemesContract;
 
diff --git a/src/com/cyngn/theme/chooser/BootReceiver.java b/src/org/cyanogenmod/theme/chooser/BootReceiver.java
index 8240bfc..00a6723 100644
--- a/src/com/cyngn/theme/chooser/BootReceiver.java
+++ b/src/org/cyanogenmod/theme/chooser/BootReceiver.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -11,8 +25,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
 public class BootReceiver extends BroadcastReceiver {
-    private static final String CHOOSER_PKG_NAME = "com.cyngn.theme.chooser";
-    private static final String CHOOSER_ACTIVITY = "com.cyngn.theme.chooser.ChooserLauncher";
+    private static final String CHOOSER_PKG_NAME = "org.cyanogenmod.theme.chooser";
+    private static final String CHOOSER_ACTIVITY = "org.cyanogenmod.theme.chooser.ChooserLauncher";
 
     @Override
     public void onReceive(Context context, Intent intent) {
diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/org/cyanogenmod/theme/chooser/ChooserActivity.java
index d607eb6..081325d 100644
--- a/src/com/cyngn/theme/chooser/ChooserActivity.java
+++ b/src/org/cyanogenmod/theme/chooser/ChooserActivity.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -50,13 +64,14 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
+import android.widget.Toast;
 
-import com.cyngn.theme.perapptheming.PerAppThemingWindow;
-import com.cyngn.theme.util.CursorLoaderHelper;
-import com.cyngn.theme.util.NotificationHelper;
-import com.cyngn.theme.util.PreferenceUtils;
-import com.cyngn.theme.util.TypefaceHelperCache;
-import com.cyngn.theme.util.Utils;
+import org.cyanogenmod.theme.perapptheming.PerAppThemingWindow;
+import org.cyanogenmod.theme.util.CursorLoaderHelper;
+import org.cyanogenmod.theme.util.NotificationHelper;
+import org.cyanogenmod.theme.util.PreferenceUtils;
+import org.cyanogenmod.theme.util.TypefaceHelperCache;
+import org.cyanogenmod.theme.util.Utils;
 
 import cyanogenmod.platform.Manifest;
 import cyanogenmod.providers.ThemesContract;
@@ -71,15 +86,13 @@ import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ALARMS
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
-
-import static com.cyngn.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
-
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_INSTALLED_THEMES;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_APPLIED;
+import static org.cyanogenmod.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_INSTALLED_THEMES;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_APPLIED;
 
 public class ChooserActivity extends FragmentActivity
         implements LoaderManager.LoaderCallbacks<Cursor> {
-    public static final String THEME_STORE_PACKAGE = "com.cyngn.themestore";
+    public static final String THEME_STORE_PACKAGE = "com.cyngn.theme.tore";
     private static final String TAG = ChooserActivity.class.getSimpleName();
 
     public static final String DEFAULT = ThemeConfig.SYSTEM_DEFAULT;
@@ -93,14 +106,6 @@ public class ChooserActivity extends FragmentActivity
 
     private static final String TYPE_IMAGE = "image/*";
 
-    private static final String CYNGN_THEMES_PERMISSION =
-            "com.cyngn.themes.permission.THEMES_APP";
-    private static final String ACTION_CHOOSER_OPENED =
-            "com.cyngn.themes.action.CHOOSER_OPENED";
-    private static final String ACTION_THEME_REMOVED =
-            "com.cyngn.themes.action.THEME_REMOVED_FROM_CHOOSER";
-    private static final String EXTRA_PACKAGE = "package";
-
     private static final String ACTION_PICK_LOCK_SCREEN_WALLPAPER =
             "com.cyngn.intent.action.PICK_LOCK_SCREEN_WALLPAPER";
 
@@ -256,9 +261,6 @@ public class ChooserActivity extends FragmentActivity
             }
         });
 
-        if (shouldHideShopThemes()) {
-            mBottomActionsLayout.findViewById(R.id.shop_themes).setVisibility(View.GONE);
-        }
         if (PreferenceUtils.getShowPerAppThemeNewTag(this)) {
             View tag = mBottomActionsLayout.findViewById(R.id.new_tag);
             if (tag != null) {
@@ -344,16 +346,26 @@ public class ChooserActivity extends FragmentActivity
                 .setDuration(ANIMATE_SHOP_THEMES_SHOW_DURATION);
     }
 
-    private boolean shouldHideShopThemes() {
-        boolean hasThemeStore = false;
-        try {
-            if (getPackageManager().getPackageInfo(THEME_STORE_PACKAGE, 0) != null) {
-                hasThemeStore = true;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
+    private void lauchGetThemes() {
+        String playStoreUrl = getString(R.string.play_store_url);
+        String wikiUrl = getString(R.string.wiki_url);
+
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(playStoreUrl));
 
+        // Try to launch play store
+        if (intent.resolveActivity(getPackageManager()) != null) {
+            startActivity(intent);
+        } else {
+            // If no play store, try to open wiki url
+            intent.setData(Uri.parse(wikiUrl));
+            if (intent.resolveActivity(getPackageManager()) != null) {
+                startActivity(intent);
+            } else {
+                Toast.makeText(this, R.string.get_more_app_not_available,
+                        Toast.LENGTH_LONG).show();
+            }
         }
-        return !hasThemeStore || Utils.isRecentTaskThemeStore(this);
     }
 
     @Override
@@ -654,7 +666,6 @@ public class ChooserActivity extends FragmentActivity
     public void uninstallTheme(String pkgName) {
         PackageManager pm = getPackageManager();
         pm.deletePackage(pkgName, new PackageDeleteObserver(), PackageManager.DELETE_ALL_USERS);
-        sendThemeRemovedBroadcast(pkgName);
     }
 
     private void slideContentIntoView(int yDelta, int selectorHeight) {
@@ -754,7 +765,6 @@ public class ChooserActivity extends FragmentActivity
         if (mTypefaceHelperCache.getTypefaceCount() <= 0) {
             new TypefacePreloadTask().execute();
         }
-        sendChooserOpenedBroadcast();
         mAnimateContentInDelay = ANIMATE_CONTENT_DELAY;
     }
 
@@ -785,16 +795,6 @@ public class ChooserActivity extends FragmentActivity
         }
     }
 
-    private void sendChooserOpenedBroadcast() {
-        sendBroadcast(new Intent(ACTION_CHOOSER_OPENED), CYNGN_THEMES_PERMISSION);
-    }
-
-    private void sendThemeRemovedBroadcast(String pkgName) {
-        Intent intent = new Intent(ACTION_THEME_REMOVED);
-        intent.putExtra(EXTRA_PACKAGE, pkgName);
-        sendBroadcast(intent, CYNGN_THEMES_PERMISSION);
-    }
-
     private void animateContentIn() {
         Drawable d = mCustomBackground.getDrawable();
         if (d instanceof TransitionDrawable) {
@@ -909,7 +909,7 @@ public class ChooserActivity extends FragmentActivity
             try {
                 startActivity(intent);
             } catch (ActivityNotFoundException e) {
-                Log.e(TAG, "Unable to launch Theme Store", e);
+                lauchGetThemes();
             }
         }
     };
diff --git a/src/com/cyngn/theme/chooser/ComponentCardView.java b/src/org/cyanogenmod/theme/chooser/ComponentCardView.java
index 24eb58c..54d97c9 100644
--- a/src/com/cyngn/theme/chooser/ComponentCardView.java
+++ b/src/org/cyanogenmod/theme/chooser/ComponentCardView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/com/cyngn/theme/chooser/ComponentSelector.java b/src/org/cyanogenmod/theme/chooser/ComponentSelector.java
index 5347250..ad0b68c 100644
--- a/src/com/cyngn/theme/chooser/ComponentSelector.java
+++ b/src/org/cyanogenmod/theme/chooser/ComponentSelector.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -34,11 +48,11 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyngn.theme.util.AudioUtils;
-import com.cyngn.theme.util.CursorLoaderHelper;
-import com.cyngn.theme.util.ThemedTypefaceHelper;
-import com.cyngn.theme.util.TypefaceHelperCache;
-import com.cyngn.theme.util.Utils;
+import org.cyanogenmod.theme.util.AudioUtils;
+import org.cyanogenmod.theme.util.CursorLoaderHelper;
+import org.cyanogenmod.theme.util.ThemedTypefaceHelper;
+import org.cyanogenmod.theme.util.TypefaceHelperCache;
+import org.cyanogenmod.theme.util.Utils;
 
 import cyanogenmod.providers.ThemesContract;
 import cyanogenmod.providers.ThemesContract.PreviewColumns;
@@ -59,17 +73,17 @@ import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NAVIGA
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ICONS;
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_FONTS;
 
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_STATUS_BAR;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_FONT;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_ICONS;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_WALLPAPER;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_NAVIGATION_BAR;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_LOCKSCREEN;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_STYLE;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_BOOT_ANIMATION;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_RINGTONE;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_NOTIFICATION;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_ALARM;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_STATUS_BAR;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_FONT;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ICONS;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_WALLPAPER;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_NAVIGATION_BAR;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_LOCKSCREEN;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_STYLE;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_BOOT_ANIMATION;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_RINGTONE;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_NOTIFICATION;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ALARM;
 
 public class ComponentSelector extends LinearLayout
         implements LoaderManager.LoaderCallbacks<Cursor> {
diff --git a/src/com/cyngn/theme/chooser/IconTransitionDrawable.java b/src/org/cyanogenmod/theme/chooser/IconTransitionDrawable.java
index 8079fc2..96547f3 100644
--- a/src/com/cyngn/theme/chooser/IconTransitionDrawable.java
+++ b/src/org/cyanogenmod/theme/chooser/IconTransitionDrawable.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyngn.theme.chooser;
+package org.cyanogenmod.theme.chooser;
 
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/cyngn/theme/chooser/MyThemeFragment.java b/src/org/cyanogenmod/theme/chooser/MyThemeFragment.java
index 8306e55..90a3f05 100644
--- a/src/com/cyngn/theme/chooser/MyThemeFragment.java
+++ b/src/org/cyanogenmod/theme/chooser/MyThemeFragment.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.app.WallpaperManager;
 import android.content.BroadcastReceiver;
@@ -32,12 +46,12 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyngn.theme.util.AudioUtils;
-import com.cyngn.theme.util.CursorLoaderHelper;
-import com.cyngn.theme.util.PreferenceUtils;
-import com.cyngn.theme.util.ThemedTypefaceHelper;
-import com.cyngn.theme.util.TypefaceHelperCache;
-import com.cyngn.theme.util.Utils;
+import org.cyanogenmod.theme.util.AudioUtils;
+import org.cyanogenmod.theme.util.CursorLoaderHelper;
+import org.cyanogenmod.theme.util.PreferenceUtils;
+import org.cyanogenmod.theme.util.ThemedTypefaceHelper;
+import org.cyanogenmod.theme.util.TypefaceHelperCache;
+import org.cyanogenmod.theme.util.Utils;
 
 import cyanogenmod.providers.ThemesContract;
 import cyanogenmod.providers.ThemesContract.PreviewColumns;
@@ -54,7 +68,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_ALL;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ALL;
 
 public class MyThemeFragment extends ThemeFragment {
     private static final String TAG = MyThemeFragment.class.getSimpleName();
diff --git a/src/com/cyngn/theme/chooser/NewFragmentStatePagerAdapter.java b/src/org/cyanogenmod/theme/chooser/NewFragmentStatePagerAdapter.java
index b60a631..cefc344 100644
--- a/src/com/cyngn/theme/chooser/NewFragmentStatePagerAdapter.java
+++ b/src/org/cyanogenmod/theme/chooser/NewFragmentStatePagerAdapter.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyngn.theme.chooser;
+package org.cyanogenmod.theme.chooser;
 
 import android.os.Bundle;
 import android.os.Parcelable;
diff --git a/src/com/cyngn/theme/chooser/NotificationHijackingService.java b/src/org/cyanogenmod/theme/chooser/NotificationHijackingService.java
index ca53791..dddd8f5 100644
--- a/src/com/cyngn/theme/chooser/NotificationHijackingService.java
+++ b/src/org/cyanogenmod/theme/chooser/NotificationHijackingService.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -35,7 +49,7 @@ public class NotificationHijackingService extends NotificationListenerService {
                     PackageInfo pi = getPackageManager().getPackageInfo(pkgName, 0);
                     if (pi != null) {
                         if (pi.themeInfo != null) {
-                            cancelNotification(GOOGLE_PLAY_PACKAGE_NAME, sbn.getTag(), sbn.getId());
+                            cancelNotification(sbn.getKey());
                         }
                     }
                 } catch (PackageManager.NameNotFoundException e) {
@@ -71,4 +85,4 @@ public class NotificationHijackingService extends NotificationListenerService {
                 Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
                 existingListeners);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/cyngn/theme/chooser/PagerContainer.java b/src/org/cyanogenmod/theme/chooser/PagerContainer.java
index 1a5e51a..852b847 100644
--- a/src/com/cyngn/theme/chooser/PagerContainer.java
+++ b/src/org/cyanogenmod/theme/chooser/PagerContainer.java
@@ -1,28 +1,21 @@
 /*
- * Copyright (c) 2012 Wireless Designs, LLC
- * Portions copyright (C) 2014, The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
  *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.content.Context;
 import android.graphics.Point;
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/org/cyanogenmod/theme/chooser/ThemeFragment.java
index 12082e5..d0891a7 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/org/cyanogenmod/theme/chooser/ThemeFragment.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -69,20 +83,20 @@ import android.widget.Space;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyngn.theme.chooser.ComponentSelector.OnItemClickedListener;
-import com.cyngn.theme.util.AudioUtils;
-import com.cyngn.theme.util.BootAnimationHelper;
-import com.cyngn.theme.util.CursorLoaderHelper;
-import com.cyngn.theme.util.IconPreviewHelper;
-import com.cyngn.theme.util.PreferenceUtils;
-import com.cyngn.theme.util.ThemedTypefaceHelper;
-import com.cyngn.theme.util.TypefaceHelperCache;
-import com.cyngn.theme.util.Utils;
-import com.cyngn.theme.util.WallpaperUtils;
-import com.cyngn.theme.widget.BootAniImageView;
-import com.cyngn.theme.widget.ConfirmCancelOverlay;
-import com.cyngn.theme.widget.LockableScrollView;
-import com.cyngn.theme.widget.ThemeTagLayout;
+import org.cyanogenmod.theme.chooser.ComponentSelector.OnItemClickedListener;
+import org.cyanogenmod.theme.util.AudioUtils;
+import org.cyanogenmod.theme.util.BootAnimationHelper;
+import org.cyanogenmod.theme.util.CursorLoaderHelper;
+import org.cyanogenmod.theme.util.IconPreviewHelper;
+import org.cyanogenmod.theme.util.PreferenceUtils;
+import org.cyanogenmod.theme.util.ThemedTypefaceHelper;
+import org.cyanogenmod.theme.util.TypefaceHelperCache;
+import org.cyanogenmod.theme.util.Utils;
+import org.cyanogenmod.theme.util.WallpaperUtils;
+import org.cyanogenmod.theme.widget.BootAniImageView;
+import org.cyanogenmod.theme.widget.ConfirmCancelOverlay;
+import org.cyanogenmod.theme.widget.LockableScrollView;
+import org.cyanogenmod.theme.widget.ThemeTagLayout;
 
 import cyanogenmod.app.ThemeVersion;
 import cyanogenmod.providers.CMSettings;
@@ -122,22 +136,22 @@ import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NAVIGA
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ICONS;
 import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_FONTS;
 
-import static com.cyngn.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
-
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_INVALID;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_ALL;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_STATUS_BAR;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_FONT;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_ICONS;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_WALLPAPER;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_NAVIGATION_BAR;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_LOCKSCREEN;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_STYLE;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_BOOT_ANIMATION;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_RINGTONE;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_NOTIFICATION;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_ALARM;
-import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_LIVE_LOCK_SCREEN;
+import static org.cyanogenmod.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
+
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_INVALID;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ALL;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_STATUS_BAR;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_FONT;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ICONS;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_WALLPAPER;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_NAVIGATION_BAR;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_LOCKSCREEN;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_STYLE;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_BOOT_ANIMATION;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_RINGTONE;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_NOTIFICATION;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ALARM;
+import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_LIVE_LOCK_SCREEN;
 
 import static cyanogenmod.providers.CMSettings.Secure.LIVE_LOCK_SCREEN_ENABLED;
 
diff --git a/src/com/cyngn/theme/chooser/WallpaperCardView.java b/src/org/cyanogenmod/theme/chooser/WallpaperCardView.java
index 337af65..a3ed8ea 100644
--- a/src/com/cyngn/theme/chooser/WallpaperCardView.java
+++ b/src/org/cyanogenmod/theme/chooser/WallpaperCardView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.chooser;
+
+package org.cyanogenmod.theme.chooser;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListLayout.java
index e475351..424d640 100644
--- a/src/com/cyngn/theme/perapptheming/PerAppThemeListLayout.java
+++ b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListLayout.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2015 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.perapptheming;
+
+package org.cyanogenmod.theme.perapptheming;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -18,7 +32,7 @@ import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Animation;
 import android.widget.FrameLayout;
 
-import com.cyngn.theme.chooser.R;
+import org.cyanogenmod.theme.chooser.R;
 
 public class PerAppThemeListLayout extends FrameLayout {
     private PerAppThemingWindow mWindow;
diff --git a/src/com/cyngn/theme/perapptheming/PerAppThemeListView.java b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListView.java
index 5a4424f..9986f60 100644
--- a/src/com/cyngn/theme/perapptheming/PerAppThemeListView.java
+++ b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListView.java
@@ -1,15 +1,30 @@
 /*
- * Copyright (C) 2015 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.perapptheming;
+
+package org.cyanogenmod.theme.perapptheming;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.ListView;
-import com.cyngn.theme.chooser.R;
-import com.cyngn.theme.util.Utils;
+
+import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.util.Utils;
 
 public class PerAppThemeListView extends ListView {
     private int mMinHeight;
diff --git a/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java b/src/org/cyanogenmod/theme/perapptheming/PerAppThemingWindow.java
index 4b6857b..27db329 100644
--- a/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java
+++ b/src/org/cyanogenmod/theme/perapptheming/PerAppThemingWindow.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2015 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.perapptheming;
+
+package org.cyanogenmod.theme.perapptheming;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -37,8 +51,8 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyngn.theme.chooser.R;
-import com.cyngn.theme.util.Utils;
+import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.util.Utils;
 
 import cyanogenmod.providers.ThemesContract.ThemesColumns;
 import cyanogenmod.themes.ThemeChangeRequest;
diff --git a/src/com/cyngn/theme/util/AudioUtils.java b/src/org/cyanogenmod/theme/util/AudioUtils.java
index 62076db..c4ad68e 100644
--- a/src/com/cyngn/theme/util/AudioUtils.java
+++ b/src/org/cyanogenmod/theme/util/AudioUtils.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
diff --git a/src/com/cyngn/theme/util/BootAnimationHelper.java b/src/org/cyanogenmod/theme/util/BootAnimationHelper.java
index 283f854..1bd4ee7 100644
--- a/src/com/cyngn/theme/util/BootAnimationHelper.java
+++ b/src/org/cyanogenmod/theme/util/BootAnimationHelper.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.app.ActivityManager;
 import android.content.Context;
diff --git a/src/com/cyngn/theme/util/CursorLoaderHelper.java b/src/org/cyanogenmod/theme/util/CursorLoaderHelper.java
index 5992779..7fcd786 100644
--- a/src/com/cyngn/theme/util/CursorLoaderHelper.java
+++ b/src/org/cyanogenmod/theme/util/CursorLoaderHelper.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2015 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/com/cyngn/theme/util/FontConfigParser.java b/src/org/cyanogenmod/theme/util/FontConfigParser.java
index ae963b8..a5b4de9 100644
--- a/src/com/cyngn/theme/util/FontConfigParser.java
+++ b/src/org/cyanogenmod/theme/util/FontConfigParser.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.util.Xml;
 
diff --git a/src/com/cyngn/theme/util/IconPreviewHelper.java b/src/org/cyanogenmod/theme/util/IconPreviewHelper.java
index 60ef9c8..3f5b897 100644
--- a/src/com/cyngn/theme/util/IconPreviewHelper.java
+++ b/src/org/cyanogenmod/theme/util/IconPreviewHelper.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.app.ActivityManager;
 import android.app.ComposedIconInfo;
diff --git a/src/com/cyngn/theme/util/NotificationHelper.java b/src/org/cyanogenmod/theme/util/NotificationHelper.java
index 3ae68d7..ebbdb66 100644
--- a/src/com/cyngn/theme/util/NotificationHelper.java
+++ b/src/org/cyanogenmod/theme/util/NotificationHelper.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -14,8 +28,8 @@ import android.content.res.Resources;
 import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 
-import com.cyngn.theme.chooser.ChooserActivity;
-import com.cyngn.theme.chooser.R;
+import org.cyanogenmod.theme.chooser.ChooserActivity;
+import org.cyanogenmod.theme.chooser.R;
 
 public class NotificationHelper {
     private static final int NOTIFICATION_ID = 0x434D5443;
diff --git a/src/com/cyngn/theme/util/PreferenceUtils.java b/src/org/cyanogenmod/theme/util/PreferenceUtils.java
index 6444c41..080615f 100644
--- a/src/com/cyngn/theme/util/PreferenceUtils.java
+++ b/src/org/cyanogenmod/theme/util/PreferenceUtils.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/src/com/cyngn/theme/util/ThemedTypefaceHelper.java b/src/org/cyanogenmod/theme/util/ThemedTypefaceHelper.java
index ce38f80..cf5ddfc 100644
--- a/src/com/cyngn/theme/util/ThemedTypefaceHelper.java
+++ b/src/org/cyanogenmod/theme/util/ThemedTypefaceHelper.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.content.Context;
 import android.content.res.AssetManager;
diff --git a/src/com/cyngn/theme/util/TypefaceHelperCache.java b/src/org/cyanogenmod/theme/util/TypefaceHelperCache.java
index ced93be..76183f8 100644
--- a/src/com/cyngn/theme/util/TypefaceHelperCache.java
+++ b/src/org/cyanogenmod/theme/util/TypefaceHelperCache.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.content.Context;
 
diff --git a/src/com/cyngn/theme/util/Utils.java b/src/org/cyanogenmod/theme/util/Utils.java
index a0b910d..94afecb 100644
--- a/src/com/cyngn/theme/util/Utils.java
+++ b/src/org/cyanogenmod/theme/util/Utils.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.app.ActivityManager;
 import android.app.WallpaperManager;
@@ -32,7 +46,7 @@ import android.view.IWindowManager;
 import android.view.WindowManager;
 import android.view.WindowManagerGlobal;
 
-import com.cyngn.theme.chooser.ChooserActivity;
+import org.cyanogenmod.theme.chooser.ChooserActivity;
 
 import cyanogenmod.externalviews.KeyguardExternalView;
 import cyanogenmod.providers.CMSettings;
diff --git a/src/com/cyngn/theme/util/WallpaperUtils.java b/src/org/cyanogenmod/theme/util/WallpaperUtils.java
index 7f7536c..c07b99b 100644
--- a/src/com/cyngn/theme/util/WallpaperUtils.java
+++ b/src/org/cyanogenmod/theme/util/WallpaperUtils.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.util;
+
+package org.cyanogenmod.theme.util;
 
 import android.app.WallpaperManager;
 import android.content.Context;
diff --git a/src/com/cyngn/theme/widget/AutoSnapHorizontalScrollView.java b/src/org/cyanogenmod/theme/widget/AutoSnapHorizontalScrollView.java
index e034357..29534f7 100644
--- a/src/com/cyngn/theme/widget/AutoSnapHorizontalScrollView.java
+++ b/src/org/cyanogenmod/theme/widget/AutoSnapHorizontalScrollView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/cyngn/theme/widget/BootAniImageView.java b/src/org/cyanogenmod/theme/widget/BootAniImageView.java
index 44363d6..b3f58a6 100644
--- a/src/com/cyngn/theme/widget/BootAniImageView.java
+++ b/src/org/cyanogenmod/theme/widget/BootAniImageView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,13 +24,15 @@ import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.ImageView;
-import libcore.io.IoUtils;
-import com.cyngn.theme.util.BootAnimationHelper;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.zip.ZipFile;
 
+import libcore.io.IoUtils;
+
+import org.cyanogenmod.theme.util.BootAnimationHelper;
+
 public class BootAniImageView extends ImageView {
     private static final String TAG = BootAniImageView.class.getName();
 
diff --git a/src/com/cyngn/theme/widget/ConfirmCancelOverlay.java b/src/org/cyanogenmod/theme/widget/ConfirmCancelOverlay.java
index 54fffa1..e00e67a 100644
--- a/src/com/cyngn/theme/widget/ConfirmCancelOverlay.java
+++ b/src/org/cyanogenmod/theme/widget/ConfirmCancelOverlay.java
@@ -1,14 +1,29 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import com.cyngn.theme.chooser.R;
+
+import org.cyanogenmod.theme.chooser.R;
 
 public class ConfirmCancelOverlay extends FrameLayout {
 
diff --git a/src/com/cyngn/theme/widget/FittedTextView.java b/src/org/cyanogenmod/theme/widget/FittedTextView.java
index 2406a59..2451d25 100644
--- a/src/com/cyngn/theme/widget/FittedTextView.java
+++ b/src/org/cyanogenmod/theme/widget/FittedTextView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.graphics.Paint;
diff --git a/src/com/cyngn/theme/widget/LatoTextView.java b/src/org/cyanogenmod/theme/widget/LatoTextView.java
index 9ced870..0cb02ae 100644
--- a/src/com/cyngn/theme/widget/LatoTextView.java
+++ b/src/org/cyanogenmod/theme/widget/LatoTextView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.content.res.AssetManager;
@@ -9,9 +23,9 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
-import android.widget.TextView;
-import com.cyngn.theme.chooser.R;
-import com.cyngn.theme.util.Utils;
+
+import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.util.Utils;
 
 import java.io.File;
 
diff --git a/src/com/cyngn/theme/widget/LockableScrollView.java b/src/org/cyanogenmod/theme/widget/LockableScrollView.java
index 88f484a..b4c9ffc 100644
--- a/src/com/cyngn/theme/widget/LockableScrollView.java
+++ b/src/org/cyanogenmod/theme/widget/LockableScrollView.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyngn/theme/widget/NavBarSpace.java b/src/org/cyanogenmod/theme/widget/NavBarSpace.java
index 993e9cf..720df29 100644
--- a/src/com/cyngn/theme/widget/NavBarSpace.java
+++ b/src/org/cyanogenmod/theme/widget/NavBarSpace.java
@@ -1,12 +1,26 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
-import com.cyngn.theme.util.Utils;
+import org.cyanogenmod.theme.util.Utils;
 
 /**
  * A simple view used to pad layouts so that content floats above the
diff --git a/src/com/cyngn/theme/widget/ThemeTagLayout.java b/src/org/cyanogenmod/theme/widget/ThemeTagLayout.java
index 18635a4..18e3da2 100644
--- a/src/com/cyngn/theme/widget/ThemeTagLayout.java
+++ b/src/org/cyanogenmod/theme/widget/ThemeTagLayout.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2014 The Cyanogen, Inc
+ * Copyright (C) 2016 Cyanogen, Inc.
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package com.cyngn.theme.widget;
+
+package org.cyanogenmod.theme.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -10,7 +24,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.cyngn.theme.chooser.R;
+
+import org.cyanogenmod.theme.chooser.R;
 
 public class ThemeTagLayout extends LinearLayout {
     private ImageView mAppliedTag;