summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnnie Chin <afchin@google.com>2016-12-13 15:03:55 -0800
committerAnnie Chin <afchin@google.com>2017-01-05 14:46:52 -0800
commit0a5cff1f3de887920e7823432a7ebf350471f98a (patch)
tree29a951fb785fa34d19d227e5e62c9e5fd3ac91c9
parent52eed7ad745fcf38439023d7239651dbbe7b6f14 (diff)
downloadandroid_packages_apps_ExactCalculator-0a5cff1f3de887920e7823432a7ebf350471f98a.tar.gz
android_packages_apps_ExactCalculator-0a5cff1f3de887920e7823432a7ebf350471f98a.tar.bz2
android_packages_apps_ExactCalculator-0a5cff1f3de887920e7823432a7ebf350471f98a.zip
Remove HistoryFragment.onCreateAnimator.
Fixes: 33587141 Fragment entry animation is there by default, but this removes the exit animation for all platforms. Change-Id: I326bf64c1eae1fe251d7729333eeee8aeea0fa1c
-rw-r--r--src/com/android/calculator2/Calculator.java8
-rw-r--r--src/com/android/calculator2/HistoryFragment.java18
2 files changed, 3 insertions, 23 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 27b0e0c..1bd7c25 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -34,7 +34,6 @@ import android.animation.PropertyValuesHolder;
import android.app.ActionBar;
import android.app.Activity;
import android.app.FragmentManager;
-import android.app.FragmentTransaction;
import android.content.ClipData;
import android.content.DialogInterface;
import android.content.Intent;
@@ -1275,7 +1274,7 @@ public class Calculator extends Activity
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_history:
- showHistoryFragment(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+ showHistoryFragment();
mDragLayout.setOpen();
return true;
case R.id.menu_leading:
@@ -1305,7 +1304,7 @@ public class Calculator extends Activity
@Override
public void onStartDraggingOpen() {
- showHistoryFragment(FragmentTransaction.TRANSIT_NONE);
+ showHistoryFragment();
}
@Override
@@ -1355,7 +1354,7 @@ public class Calculator extends Activity
return true;
}
- private void showHistoryFragment(int transit) {
+ private void showHistoryFragment() {
final FragmentManager manager = getFragmentManager();
if (manager == null || manager.isDestroyed()) {
return;
@@ -1368,7 +1367,6 @@ public class Calculator extends Activity
manager.beginTransaction()
.replace(R.id.history_frame, mHistoryFragment, HistoryFragment.TAG)
- .setTransition(transit)
.addToBackStack(HistoryFragment.TAG)
.commit();
manager.executePendingTransactions();
diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index 454c47a..a4ae9c8 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -16,10 +16,7 @@
package com.android.calculator2;
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
import android.app.Fragment;
-import android.app.FragmentTransaction;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
@@ -161,21 +158,6 @@ public class HistoryFragment extends Fragment implements DragLayout.DragCallback
}
@Override
- public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
- final View view = getView();
- final int height = getResources().getDisplayMetrics().heightPixels;
- if (enter) {
- if (transit == FragmentTransaction.TRANSIT_FRAGMENT_OPEN) {
- return ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, -height, 0f);
- } else {
- return null;
- }
- } else {
- return ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, -height);
- }
- }
-
- @Override
public void onDestroyView() {
final DragLayout dragLayout = (DragLayout) getActivity().findViewById(R.id.drag_layout);
if (dragLayout != null) {