pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Animation fix for 2.3

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-06-17 02:56:23 +03:00 • committed by Alex Zolotarev
parent e2673fd345
commit 16e5b964e5
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -752,6 +752,15 @@ public class MWMActivity extends BaseMwmFragmentActivity
private void hideBottomButtons()
{
UiUtils.hide(mLlBookmarks, mLlDownloader, mLlSettings, mLlShare, mLlSearch);
// IMPORTANT views after alpha animations with 'setFillAfter' on 2.3 can't become GONE, until clearAnimation is called.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
{
mLlSearch.clearAnimation();
mLlBookmarks.clearAnimation();
mLlDownloader.clearAnimation();
mLlShare.clearAnimation();
mLlSettings.clearAnimation();
}
if (mButtonsAnimation != null && mButtonsAnimation.isRunning())
mButtonsAnimation.end();
mBtnMenu.setVisibility(View.VISIBLE);

4
android/src/com/mapswithme/maps/widget/FadeView.java
View file

@ -1,6 +1,7 @@
package com.mapswithme.maps.widget;
import android.content.Context;
import android.os.Build;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.MotionEvent;
@ -25,6 +26,9 @@ public class FadeView extends FrameLayout
public void onAnimationEnd(Animator animation)
{
setVisibility(View.GONE);
// IMPORTANT views after alpha animations with 'setFillAfter' on 2.3 can't become GONE, until clearAnimation is called.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
clearAnimation();
if (mFadeListener != null && mDoNotify)
mFadeListener.onFadeOut();
}