Fall cleaning

 * Change package name to org.cyanogenmod.theme.chooser2
   to avoid theme collisions with old OSS chooser
 * Change parent theme to Theme.Material.Light
 * Change minSdkVersion to 21 since we are going material
 * Add selectors for bottom action buttons (app themer, shop themes)
 * Add selector, using app themer color, for app themer list view
 * Add selector for actions in theme cards
 * Bring back OSS app icon
 * Reduce log spam in ThemedTypefaceHelper
 * Localize "new" tag using a TextView instead of an image
 * Other random stuff

Change-Id: I73ef0b9c9370284e29ee00add87273cf54c83e0e

23 files changed, 84 insertions, 93 deletions

diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java
index ba0911e..1cde715 100644
--- a/src/android/support/v4/view/ThemeViewPager.java
+++ b/src/android/support/v4/view/ThemeViewPager.java
@@ -24,7 +24,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 
 public class ThemeViewPager extends ViewPager {
     private static final String TAG = ThemeViewPager.class.getSimpleName();
diff --git a/src/com/viewpagerindicator/CirclePageIndicator.java b/src/com/viewpagerindicator/CirclePageIndicator.java
index 19b031e..ef44f50 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 org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 
 import static android.graphics.Paint.ANTI_ALIAS_FLAG;
 import static android.widget.LinearLayout.HORIZONTAL;
diff --git a/src/org/cyanogenmod/theme/chooser/AppReceiver.java b/src/org/cyanogenmod/theme/chooser2/AppReceiver.java
index 0c3037e..9ac3f91 100644
--- a/src/org/cyanogenmod/theme/chooser/AppReceiver.java
+++ b/src/org/cyanogenmod/theme/chooser2/AppReceiver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -29,8 +29,6 @@ import org.cyanogenmod.theme.util.NotificationHelper;
 import org.cyanogenmod.theme.util.PreferenceUtils;
 import org.cyanogenmod.theme.util.Utils;
 
-import cyanogenmod.providers.ThemesContract;
-
 public class AppReceiver extends BroadcastReceiver {
 
     @Override
diff --git a/src/org/cyanogenmod/theme/chooser/BootReceiver.java b/src/org/cyanogenmod/theme/chooser2/BootReceiver.java
index 00a6723..02dc107 100644
--- a/src/org/cyanogenmod/theme/chooser/BootReceiver.java
+++ b/src/org/cyanogenmod/theme/chooser2/BootReceiver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
diff --git a/src/org/cyanogenmod/theme/chooser/ChooserActivity.java b/src/org/cyanogenmod/theme/chooser2/ChooserActivity.java
index 081325d..3e63dfa 100644
--- a/src/org/cyanogenmod/theme/chooser/ChooserActivity.java
+++ b/src/org/cyanogenmod/theme/chooser2/ChooserActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -60,9 +60,11 @@ import android.util.MutableLong;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
 
@@ -86,7 +88,7 @@ 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 org.cyanogenmod.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
+import static org.cyanogenmod.theme.chooser2.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;
 
@@ -143,7 +145,7 @@ public class ChooserActivity extends FragmentActivity
     private ThemesAdapter mAdapter;
     private boolean mExpanded = false;
     private ComponentSelector mSelector;
-    private View mSaveApplyLayout;
+    private Button mSaveApplyButton;
     private int mContainerYOffset = 0;
     private TypefaceHelperCache mTypefaceHelperCache;
     private boolean mIsAnimating;
@@ -190,6 +192,8 @@ public class ChooserActivity extends FragmentActivity
         int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 48, dm);
         mPager.setPageMargin(-margin / 2);
         mPager.setOffscreenPageLimit(OFFSCREEN_PAGE_LIMIT);
+        mPager.setClipChildren(false);
+        mPager.setClipToPadding(false);
 
         mPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             public void onPageSelected(int position) {
@@ -209,36 +213,8 @@ public class ChooserActivity extends FragmentActivity
 
         mBottomActionsLayout = findViewById(R.id.bottom_actions_layout);
 
-        mSaveApplyLayout = findViewById(R.id.save_apply_layout);
-        mSaveApplyLayout.findViewById(R.id.save_apply_button).setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (mIsAnimating) return;
-                        hideSaveApplyButton();
-                        mContainer.setClickable(false);
-                        final ThemeFragment f = getCurrentFragment();
-                        if (mSelector.isEnabled()) {
-                            mSelector.hide();
-                            if (mContainerYOffset != 0) {
-                                slideContentBack(-mContainerYOffset);
-                                mContainerYOffset = 0;
-                            }
-                            if (f != null) f.fadeInCards();
-                            if (mShowLockScreenWallpaper) {
-                                mShowLockScreenWallpaper = false;
-                                mSelector.resetComponentType();
-                            }
-                        }
-
-                        mHandler.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                collapse(true);
-                            }
-                        }, ONCLICK_SAVE_APPLY_FINISH_ANIMATION_DELAY);
-                    }
-                });
+        mSaveApplyButton = (Button) findViewById(R.id.save_apply_button);
+        mSaveApplyButton.setOnClickListener(mOnSaveApplyClicked);
 
         mBottomActionsLayout.findViewById(R.id.shop_themes)
                             .setOnClickListener(mOnShopThemesClicked);
@@ -270,34 +246,28 @@ public class ChooserActivity extends FragmentActivity
     }
 
     public void showSaveApplyButton() {
-        if (mSaveApplyLayout != null && mSaveApplyLayout.getVisibility() != View.VISIBLE) {
+        if (mSaveApplyButton != null && mSaveApplyButton.getVisibility() != View.VISIBLE) {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    int navBarHeight = 0;
-                    if (Utils.hasNavigationBar(ChooserActivity.this.getApplicationContext())) {
-                        navBarHeight = ChooserActivity.this.getResources()
-                                .getDimensionPixelSize(R.dimen.navigation_bar_height);
-                    }
-                    mSaveApplyLayout.setTranslationY(mSaveApplyLayout.getMeasuredHeight());
-                    mSaveApplyLayout.setVisibility(View.VISIBLE);
-                    mSaveApplyLayout.animate()
+                    mSaveApplyButton.setTranslationY(mSaveApplyButton.getMeasuredHeight());
+                    mSaveApplyButton.setVisibility(View.VISIBLE);
+                    mSaveApplyButton.animate()
                             .setDuration(ANIMATE_SAVE_APPLY_LAYOUT_DURATION)
                             .setInterpolator(
                                     new DecelerateInterpolator(
                                             ANIMATE_SAVE_APPLY_DECELERATE_INTERPOLATOR_FACTOR))
-                            .translationY(-mSelector.getMeasuredHeight()
-                                    + navBarHeight);
+                            .translationY(-mSelector.getMeasuredHeight());
                 }
             });
         }
     }
 
     public void hideSaveApplyButton() {
-        if (mSaveApplyLayout.getVisibility() != View.GONE) {
+        if (mSaveApplyButton.getVisibility() != View.GONE) {
             Animation anim = AnimationUtils.loadAnimation(this,
                     R.anim.component_selection_animate_out);
-            mSaveApplyLayout.startAnimation(anim);
+            mSaveApplyButton.startAnimation(anim);
             anim.setAnimationListener(new Animation.AnimationListener() {
                 @Override
                 public void onAnimationStart(Animation animation) {
@@ -305,7 +275,7 @@ public class ChooserActivity extends FragmentActivity
 
                 @Override
                 public void onAnimationEnd(Animation animation) {
-                    mSaveApplyLayout.setVisibility(View.GONE);
+                    mSaveApplyButton.setVisibility(View.GONE);
                 }
 
                 @Override
@@ -574,10 +544,6 @@ public class ChooserActivity extends FragmentActivity
         return mSelector;
     }
 
-    public void showComponentSelector(String component, View v) {
-        showComponentSelector(component, null, DEFAULT_COMPONENT_ID, v);
-    }
-
     public void showComponentSelector(String component, String selectedPkgName,
             long selectedCmpntId, View v) {
         if (component != null) {
@@ -595,13 +561,12 @@ public class ChooserActivity extends FragmentActivity
                 height = res.getDimensionPixelSize(
                         R.dimen.component_selection_cell_height_sounds);
             }
-            if (mSaveApplyLayout.getVisibility() == View.VISIBLE) {
-                if (mSaveApplyLayout.getTranslationY() + height != 0) {
-                    mSaveApplyLayout.animate()
+            if (mSaveApplyButton.getVisibility() == View.VISIBLE) {
+                if (mSaveApplyButton.getTranslationY() + height != 0) {
+                    mSaveApplyButton.animate()
                             .translationY(-height)
                             .setInterpolator(
-                                    new DecelerateInterpolator(
-                                            ANIMATE_SAVE_APPLY_DECELERATE_INTERPOLATOR_FACTOR))
+                                    new AccelerateDecelerateInterpolator())
                             .setDuration(ANIMATE_SAVE_APPLY_LAYOUT_DURATION);
                 }
             }
@@ -728,7 +693,7 @@ public class ChooserActivity extends FragmentActivity
                 return;
             }
 
-            if (mSaveApplyLayout.getVisibility() == View.VISIBLE) {
+            if (mSaveApplyButton.getVisibility() == View.VISIBLE) {
                 hideSaveApplyButton();
                 if (f != null) f.clearChanges();
             }
@@ -851,8 +816,8 @@ public class ChooserActivity extends FragmentActivity
         public void onSelectorClosing() {
             ThemeFragment f = getCurrentFragment();
             if (f != null && f.componentsChanged()
-                    && mSaveApplyLayout.getVisibility() == View.VISIBLE) {
-                mSaveApplyLayout.animate()
+                    && mSaveApplyButton.getVisibility() == View.VISIBLE) {
+                mSaveApplyButton.animate()
                         .translationY(0)
                         .setInterpolator(new DecelerateInterpolator())
                         .setDuration(ANIMATE_SAVE_APPLY_LAYOUT_DURATION);
@@ -914,6 +879,35 @@ public class ChooserActivity extends FragmentActivity
         }
     };
 
+    private View.OnClickListener mOnSaveApplyClicked = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if (mIsAnimating) return;
+            hideSaveApplyButton();
+            mContainer.setClickable(false);
+            final ThemeFragment f = getCurrentFragment();
+            if (mSelector.isEnabled()) {
+                mSelector.hide();
+                if (mContainerYOffset != 0) {
+                    slideContentBack(-mContainerYOffset);
+                    mContainerYOffset = 0;
+                }
+                if (f != null) f.fadeInCards();
+                if (mShowLockScreenWallpaper) {
+                    mShowLockScreenWallpaper = false;
+                    mSelector.resetComponentType();
+                }
+            }
+
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    collapse(true);
+                }
+            }, ONCLICK_SAVE_APPLY_FINISH_ANIMATION_DELAY);
+        }
+    };
+
     private <T> void startLoader(int loaderId) {
         final LoaderManager manager = getSupportLoaderManager();
         final Loader<T> loader = manager.getLoader(loaderId);
diff --git a/src/org/cyanogenmod/theme/chooser/ComponentCardView.java b/src/org/cyanogenmod/theme/chooser2/ComponentCardView.java
index 54d97c9..f9578c7 100644
--- a/src/org/cyanogenmod/theme/chooser/ComponentCardView.java
+++ b/src/org/cyanogenmod/theme/chooser2/ComponentCardView.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
-import android.animation.IntEvaluator;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
diff --git a/src/org/cyanogenmod/theme/chooser/ComponentSelector.java b/src/org/cyanogenmod/theme/chooser2/ComponentSelector.java
index ad0b68c..178c9b6 100644
--- a/src/org/cyanogenmod/theme/chooser/ComponentSelector.java
+++ b/src/org/cyanogenmod/theme/chooser2/ComponentSelector.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/src/org/cyanogenmod/theme/chooser/IconTransitionDrawable.java b/src/org/cyanogenmod/theme/chooser2/IconTransitionDrawable.java
index 96547f3..08cc910 100644
--- a/src/org/cyanogenmod/theme/chooser/IconTransitionDrawable.java
+++ b/src/org/cyanogenmod/theme/chooser2/IconTransitionDrawable.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
diff --git a/src/org/cyanogenmod/theme/chooser/MyThemeFragment.java b/src/org/cyanogenmod/theme/chooser2/MyThemeFragment.java
index 90a3f05..490b568 100644
--- a/src/org/cyanogenmod/theme/chooser/MyThemeFragment.java
+++ b/src/org/cyanogenmod/theme/chooser2/MyThemeFragment.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.app.WallpaperManager;
 import android.content.BroadcastReceiver;
diff --git a/src/org/cyanogenmod/theme/chooser/NewFragmentStatePagerAdapter.java b/src/org/cyanogenmod/theme/chooser2/NewFragmentStatePagerAdapter.java
index cefc344..e108a76 100644
--- a/src/org/cyanogenmod/theme/chooser/NewFragmentStatePagerAdapter.java
+++ b/src/org/cyanogenmod/theme/chooser2/NewFragmentStatePagerAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.os.Bundle;
 import android.os.Parcelable;
diff --git a/src/org/cyanogenmod/theme/chooser/NotificationHijackingService.java b/src/org/cyanogenmod/theme/chooser2/NotificationHijackingService.java
index dddd8f5..cee1b4f 100644
--- a/src/org/cyanogenmod/theme/chooser/NotificationHijackingService.java
+++ b/src/org/cyanogenmod/theme/chooser2/NotificationHijackingService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
diff --git a/src/org/cyanogenmod/theme/chooser/PagerContainer.java b/src/org/cyanogenmod/theme/chooser2/PagerContainer.java
index 852b847..a4349bd 100644
--- a/src/org/cyanogenmod/theme/chooser/PagerContainer.java
+++ b/src/org/cyanogenmod/theme/chooser2/PagerContainer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.content.Context;
 import android.graphics.Point;
diff --git a/src/org/cyanogenmod/theme/chooser/ThemeFragment.java b/src/org/cyanogenmod/theme/chooser2/ThemeFragment.java
index d0891a7..6a73598 100644
--- a/src/org/cyanogenmod/theme/chooser/ThemeFragment.java
+++ b/src/org/cyanogenmod/theme/chooser2/ThemeFragment.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -83,7 +83,7 @@ import android.widget.Space;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.cyanogenmod.theme.chooser.ComponentSelector.OnItemClickedListener;
+import org.cyanogenmod.theme.chooser2.ComponentSelector.OnItemClickedListener;
 import org.cyanogenmod.theme.util.AudioUtils;
 import org.cyanogenmod.theme.util.BootAnimationHelper;
 import org.cyanogenmod.theme.util.CursorLoaderHelper;
@@ -136,7 +136,7 @@ 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 org.cyanogenmod.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
+import static org.cyanogenmod.theme.chooser2.ComponentSelector.DEFAULT_COMPONENT_ID;
 
 import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_INVALID;
 import static org.cyanogenmod.theme.util.CursorLoaderHelper.LOADER_ID_ALL;
diff --git a/src/org/cyanogenmod/theme/chooser/WallpaperCardView.java b/src/org/cyanogenmod/theme/chooser2/WallpaperCardView.java
index a3ed8ea..74c39f5 100644
--- a/src/org/cyanogenmod/theme/chooser/WallpaperCardView.java
+++ b/src/org/cyanogenmod/theme/chooser2/WallpaperCardView.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.theme.chooser;
+package org.cyanogenmod.theme.chooser2;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListLayout.java b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListLayout.java
index 424d640..fa3a5f0 100644
--- a/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListLayout.java
+++ b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListLayout.java
@@ -29,10 +29,9 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.Animation;
 import android.widget.FrameLayout;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 
 public class PerAppThemeListLayout extends FrameLayout {
     private PerAppThemingWindow mWindow;
diff --git a/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListView.java b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListView.java
index 9986f60..ffc7016 100644
--- a/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListView.java
+++ b/src/org/cyanogenmod/theme/perapptheming/PerAppThemeListView.java
@@ -23,7 +23,7 @@ import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.ListView;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 import org.cyanogenmod.theme.util.Utils;
 
 public class PerAppThemeListView extends ListView {
diff --git a/src/org/cyanogenmod/theme/perapptheming/PerAppThemingWindow.java b/src/org/cyanogenmod/theme/perapptheming/PerAppThemingWindow.java
index 27db329..89401b4 100644
--- a/src/org/cyanogenmod/theme/perapptheming/PerAppThemingWindow.java
+++ b/src/org/cyanogenmod/theme/perapptheming/PerAppThemingWindow.java
@@ -51,7 +51,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 import org.cyanogenmod.theme.util.Utils;
 
 import cyanogenmod.providers.ThemesContract.ThemesColumns;
@@ -633,7 +633,9 @@ public class PerAppThemingWindow extends Service implements OnTouchListener,
                             WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH |
                             WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL |
                             WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED |
-                            WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,
+                            WindowManager.LayoutParams.FLAG_SPLIT_TOUCH |
+                            WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
+                            WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
                     PixelFormat.TRANSLUCENT);
         }
         mListLayoutParams.gravity = Gravity.TOP |
@@ -663,9 +665,9 @@ public class PerAppThemingWindow extends Service implements OnTouchListener,
     }
 
     private void showScrim() {
+        mThemeListLayout.setEnabled(false);
         ValueAnimator animator = ValueAnimator.ofArgb(SCRIM_COLOR_TRANSPARENT,
                 SCRIM_COLOR_OPAQUE);
-        mThemeListLayout.setEnabled(false);
         animator.setDuration(ANIMATION_DURATION)
                 .addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                     @Override
@@ -681,6 +683,7 @@ public class PerAppThemingWindow extends Service implements OnTouchListener,
     }
 
     private void hideScrim() {
+        mThemeListLayout.setEnabled(true);
         ValueAnimator animator = ValueAnimator.ofArgb(SCRIM_COLOR_OPAQUE, SCRIM_COLOR_TRANSPARENT);
         animator.setDuration(ANIMATION_DURATION)
                 .addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
diff --git a/src/org/cyanogenmod/theme/util/NotificationHelper.java b/src/org/cyanogenmod/theme/util/NotificationHelper.java
index ebbdb66..c6527ab 100644
--- a/src/org/cyanogenmod/theme/util/NotificationHelper.java
+++ b/src/org/cyanogenmod/theme/util/NotificationHelper.java
@@ -25,11 +25,10 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 
-import org.cyanogenmod.theme.chooser.ChooserActivity;
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.ChooserActivity;
+import org.cyanogenmod.theme.chooser2.R;
 
 public class NotificationHelper {
     private static final int NOTIFICATION_ID = 0x434D5443;
diff --git a/src/org/cyanogenmod/theme/util/ThemedTypefaceHelper.java b/src/org/cyanogenmod/theme/util/ThemedTypefaceHelper.java
index cf5ddfc..2aba858 100644
--- a/src/org/cyanogenmod/theme/util/ThemedTypefaceHelper.java
+++ b/src/org/cyanogenmod/theme/util/ThemedTypefaceHelper.java
@@ -53,14 +53,14 @@ public class ThemedTypefaceHelper {
             return;
         } catch(Exception e) {
             Log.w(TAG, "Unable to parse and load themed fonts for " + pkgName +
-                    ". Falling back to system fonts", e );
+                    ". Falling back to system fonts");
         }
 
         try {
             loadSystemFonts();
             return;
         } catch(Exception e) {
-            Log.e(TAG, "Parsing system fonts failed. Falling back to Typeface loaded fonts", e);
+            Log.e(TAG, "Parsing system fonts failed. Falling back to Typeface loaded fonts");
         }
 
         // There is no reason for this to happen unless someone
diff --git a/src/org/cyanogenmod/theme/util/Utils.java b/src/org/cyanogenmod/theme/util/Utils.java
index 94afecb..9074ab3 100644
--- a/src/org/cyanogenmod/theme/util/Utils.java
+++ b/src/org/cyanogenmod/theme/util/Utils.java
@@ -38,7 +38,6 @@ import android.graphics.BitmapRegionDecoder;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.RemoteException;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
@@ -46,7 +45,7 @@ import android.view.IWindowManager;
 import android.view.WindowManager;
 import android.view.WindowManagerGlobal;
 
-import org.cyanogenmod.theme.chooser.ChooserActivity;
+import org.cyanogenmod.theme.chooser2.ChooserActivity;
 
 import cyanogenmod.externalviews.KeyguardExternalView;
 import cyanogenmod.providers.CMSettings;
diff --git a/src/org/cyanogenmod/theme/widget/ConfirmCancelOverlay.java b/src/org/cyanogenmod/theme/widget/ConfirmCancelOverlay.java
index e00e67a..dcfcbfc 100644
--- a/src/org/cyanogenmod/theme/widget/ConfirmCancelOverlay.java
+++ b/src/org/cyanogenmod/theme/widget/ConfirmCancelOverlay.java
@@ -23,7 +23,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 
 public class ConfirmCancelOverlay extends FrameLayout {
 
diff --git a/src/org/cyanogenmod/theme/widget/LatoTextView.java b/src/org/cyanogenmod/theme/widget/LatoTextView.java
index 0cb02ae..a6056ee 100644
--- a/src/org/cyanogenmod/theme/widget/LatoTextView.java
+++ b/src/org/cyanogenmod/theme/widget/LatoTextView.java
@@ -24,7 +24,7 @@ import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 import org.cyanogenmod.theme.util.Utils;
 
 import java.io.File;
diff --git a/src/org/cyanogenmod/theme/widget/ThemeTagLayout.java b/src/org/cyanogenmod/theme/widget/ThemeTagLayout.java
index 18e3da2..701b78b 100644
--- a/src/org/cyanogenmod/theme/widget/ThemeTagLayout.java
+++ b/src/org/cyanogenmod/theme/widget/ThemeTagLayout.java
@@ -25,7 +25,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.cyanogenmod.theme.chooser.R;
+import org.cyanogenmod.theme.chooser2.R;
 
 public class ThemeTagLayout extends LinearLayout {
     private ImageView mAppliedTag;