diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-03-24 20:42:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 20:42:47 +0000 |
| commit | 77872f4260fc52b16659f55c2b701e61fd578a60 (patch) | |
| tree | cdb4a261d2aae8e0caab07ae8805010c96fe365c /InCallUI | |
| parent | a8ab40f190e9f55ef0bd6930185d1c82e153a079 (diff) | |
| parent | 47ff8ab4103ae0107798999a1284becfa1baf0e2 (diff) | |
am 9e1f62f0: am b1fc41c9: DO NOT MERGE Fix for in-call dialpad not sliding full length of screen
* commit '9e1f62f0d64b42987897dbe93b9bc74646f2ab21':
DO NOT MERGE Fix for in-call dialpad not sliding full length of screen
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/anim/incall_dialpad_slide_in.xml (renamed from InCallUI/res/anim/slide_in.xml) | 2 | ||||
| -rw-r--r-- | InCallUI/res/anim/incall_dialpad_slide_out.xml (renamed from InCallUI/res/anim/slide_out.xml) | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/res/anim/slide_in.xml b/InCallUI/res/anim/incall_dialpad_slide_in.xml index c8372ce27..89f4552ab 100644 --- a/InCallUI/res/anim/slide_in.xml +++ b/InCallUI/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/InCallUI/res/anim/slide_out.xml b/InCallUI/res/anim/incall_dialpad_slide_out.xml index 2861db275..7fa03a252 100644 --- a/InCallUI/res/anim/slide_out.xml +++ b/InCallUI/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/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java index 1c22c3d80..236b38c9c 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -43,7 +43,7 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese 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/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index fa6cc2dc6..c34d85470 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -405,10 +405,10 @@ public class InCallActivity extends Activity { 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(); |