From c1023e5563082fe7793dbce4dadfb0e060c1daa2 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 24 Mar 2014 12:18:11 -0700
Subject: DO NOT MERGE Fix for in-call dialpad not sliding full length of
 screen

Bug: 13189041
Change-Id: I5b5ceda11d1d5b89141255f867deb8688c95f5d4
---
 InCallUI/res/anim/incall_dialpad_slide_in.xml      | 23 ++++++++++++++++++++++
 InCallUI/res/anim/incall_dialpad_slide_out.xml     | 23 ++++++++++++++++++++++
 InCallUI/res/anim/slide_in.xml                     | 23 ----------------------
 InCallUI/res/anim/slide_out.xml                    | 23 ----------------------
 .../src/com/android/incallui/DialpadFragment.java  |  2 +-
 .../src/com/android/incallui/InCallActivity.java   |  4 ++--
 6 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 InCallUI/res/anim/incall_dialpad_slide_in.xml
 create mode 100644 InCallUI/res/anim/incall_dialpad_slide_out.xml
 delete mode 100644 InCallUI/res/anim/slide_in.xml
 delete mode 100644 InCallUI/res/anim/slide_out.xml

(limited to 'InCallUI')

diff --git a/InCallUI/res/anim/incall_dialpad_slide_in.xml b/InCallUI/res/anim/incall_dialpad_slide_in.xml
new file mode 100644
index 000000000..89f4552ab
--- /dev/null
+++ b/InCallUI/res/anim/incall_dialpad_slide_in.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:valueFrom="1.0"
+    android:valueTo="0"
+    android:valueType="floatType"
+    android:propertyName="yFraction"
+    android:duration="200" />
\ No newline at end of file
diff --git a/InCallUI/res/anim/incall_dialpad_slide_out.xml b/InCallUI/res/anim/incall_dialpad_slide_out.xml
new file mode 100644
index 000000000..7fa03a252
--- /dev/null
+++ b/InCallUI/res/anim/incall_dialpad_slide_out.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:valueFrom="0"
+    android:valueTo="1.0"
+    android:valueType="floatType"
+    android:propertyName="yFraction"
+    android:duration="200" />
\ No newline at end of file
diff --git a/InCallUI/res/anim/slide_in.xml b/InCallUI/res/anim/slide_in.xml
deleted file mode 100644
index c8372ce27..000000000
--- a/InCallUI/res/anim/slide_in.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<objectAnimator
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:valueFrom="0.67"
-    android:valueTo="0"
-    android:valueType="floatType"
-    android:propertyName="yFraction"
-    android:duration="200" />
\ No newline at end of file
diff --git a/InCallUI/res/anim/slide_out.xml b/InCallUI/res/anim/slide_out.xml
deleted file mode 100644
index 2861db275..000000000
--- a/InCallUI/res/anim/slide_out.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<objectAnimator
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:valueFrom="0"
-    android:valueTo="0.67"
-    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();
-- 
cgit v1.2.3