diff options
Diffstat (limited to 'src/com/android/deskclock/widget/EmptyViewController.java')
| -rw-r--r-- | src/com/android/deskclock/widget/EmptyViewController.java | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/com/android/deskclock/widget/EmptyViewController.java b/src/com/android/deskclock/widget/EmptyViewController.java index 4a2199932..0c7fbb89b 100644 --- a/src/com/android/deskclock/widget/EmptyViewController.java +++ b/src/com/android/deskclock/widget/EmptyViewController.java @@ -31,7 +31,6 @@ import com.android.deskclock.Utils; public final class EmptyViewController { private static final int ANIMATION_DURATION = 300; - private static final boolean USE_TRANSITION_FRAMEWORK = Utils.isLOrLater(); private final Transition mEmptyViewTransition; private final ViewGroup mMainLayout; @@ -49,17 +48,14 @@ public final class EmptyViewController { mMainLayout = mainLayout; mContentView = contentView; mEmptyView = emptyView; - if (USE_TRANSITION_FRAMEWORK) { - mEmptyViewTransition = new TransitionSet() - .setOrdering(TransitionSet.ORDERING_SEQUENTIAL) - .addTarget(contentView) - .addTarget(emptyView) - .addTransition(new Fade(Fade.OUT)) - .addTransition(new Fade(Fade.IN)) - .setDuration(ANIMATION_DURATION); - } else { - mEmptyViewTransition = null; - } + mEmptyViewTransition = new TransitionSet() + .setOrdering(TransitionSet.ORDERING_SEQUENTIAL) + .addTarget(contentView) + .addTarget(emptyView) + .addTransition(new Fade(Fade.OUT)) + .addTransition(new Fade(Fade.IN)) + .setDuration(ANIMATION_DURATION); + } /** @@ -73,9 +69,7 @@ public final class EmptyViewController { } mIsEmpty = isEmpty; // State changed, perform transition. - if (USE_TRANSITION_FRAMEWORK) { - TransitionManager.beginDelayedTransition(mMainLayout, mEmptyViewTransition); - } + TransitionManager.beginDelayedTransition(mMainLayout, mEmptyViewTransition); mEmptyView.setVisibility(mIsEmpty ? View.VISIBLE : View.GONE); mContentView.setVisibility(mIsEmpty ? View.GONE : View.VISIBLE); } |