Merge branch 'release/3.2' into develop

Author: maxme

WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java

@@ -60,6 +60,7 @@
 import org.wordpress.android.util.BlogUtils;
 import org.wordpress.android.util.DeviceUtils;
 import org.wordpress.android.util.DisplayUtils;
+import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ToastUtils.Duration;
 import org.wordpress.android.util.ptr.PullToRefreshHelper;
@@ -263,6 +264,9 @@ private void initMenuDrawer() {
      * Create menu drawer ListView and listeners
      */
     private void initMenuDrawer(int blogSelection) {
+        if (mMenuDrawer == null) {
+            return;
+        }
         mListView = new ListView(this);
         mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         mListView.setDivider(null);
@@ -576,8 +580,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     // new blog has been added, so rebuild cache of blogs and setup current blog
                     getBlogNames();
                     setupCurrentBlog();
-                    initMenuDrawer();
-                    mMenuDrawer.openMenu(false);
+                    if (mMenuDrawer != null) {
+                        initMenuDrawer();
+                        mMenuDrawer.openMenu(false);
+                    }
                     WordPress.registerForCloudMessaging(this);
                     // If logged in without blog, redirect to the Reader view
                     showReaderIfNoBlog();

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderAnim.java

@@ -211,6 +211,8 @@ private static void animateButton(final View target, ReaderButton button) {
                 // rotate like button +/- 72 degrees (72 = 360/5, 5 is the number of points in the star)
                 float endRotate = (button == ReaderButton.LIKE_ON ? 72f : -72f);
                 ObjectAnimator animRotate = ObjectAnimator.ofFloat(target, View.ROTATION, 0f, endRotate);
+                animRotate.setRepeatMode(ValueAnimator.REVERSE);
+                animRotate.setRepeatCount(1);
                 set.play(animX).with(animY).with(animRotate);
                 // on Android 4.4.3 the rotation animation may cause the drawable to fade out unless
                 // we set the layer type - https://code.google.com/p/android/issues/detail?id=70914