Merge "Import translations. DO NOT MERGE" into klp-dev
diff --git a/res/anim/slide_in.xml b/res/anim/incall_dialpad_slide_in.xml
similarity index 96%
rename from res/anim/slide_in.xml
rename to res/anim/incall_dialpad_slide_in.xml
index c8372ce..89f4552 100644
--- a/res/anim/slide_in.xml
+++ b/res/anim/incall_dialpad_slide_in.xml
@@ -16,7 +16,7 @@
<objectAnimator
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
- android:valueFrom="0.67"
+ android:valueFrom="1.0"
android:valueTo="0"
android:valueType="floatType"
android:propertyName="yFraction"
diff --git a/res/anim/slide_out.xml b/res/anim/incall_dialpad_slide_out.xml
similarity index 96%
rename from res/anim/slide_out.xml
rename to res/anim/incall_dialpad_slide_out.xml
index 2861db2..7fa03a2 100644
--- a/res/anim/slide_out.xml
+++ b/res/anim/incall_dialpad_slide_out.xml
@@ -17,7 +17,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:valueFrom="0"
- android:valueTo="0.67"
+ android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="yFraction"
android:duration="200" />
\ No newline at end of file
diff --git a/src/com/android/incallui/DialpadFragment.java b/src/com/android/incallui/DialpadFragment.java
index 1c22c3d..236b38c 100644
--- a/src/com/android/incallui/DialpadFragment.java
+++ b/src/com/android/incallui/DialpadFragment.java
@@ -43,7 +43,7 @@
implements DialpadPresenter.DialpadUi, View.OnTouchListener, View.OnKeyListener,
View.OnHoverListener, View.OnClickListener {
- private static final float DIALPAD_SLIDE_FRACTION = 0.67f;
+ private static final float DIALPAD_SLIDE_FRACTION = 1.0f;
/**
* LinearLayout with getter and setter methods for the translationY property using floats,
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index fa6cc2d..c34d854 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -405,10 +405,10 @@
public void displayDialpad(boolean showDialpad) {
final FragmentTransaction ft = getFragmentManager().beginTransaction();
if (showDialpad) {
- ft.setCustomAnimations(R.anim.slide_in, 0);
+ ft.setCustomAnimations(R.anim.incall_dialpad_slide_in, 0);
ft.show(mDialpadFragment);
} else {
- ft.setCustomAnimations(0, R.anim.slide_out);
+ ft.setCustomAnimations(0, R.anim.incall_dialpad_slide_out);
ft.hide(mDialpadFragment);
}
ft.commitAllowingStateLoss();
