diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-08 20:58:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 20:58:00 +0000 |
| commit | 5ddd42e31827d070b4927308b89d1b28d4a276c1 (patch) | |
| tree | 34a33e9fc61b1848da358b7150882f7e686447df | |
| parent | cfd73c55aae1900fd4291d09e499392312d96d6a (diff) | |
| parent | 3b4ddb795f36a6dd707f7864381b6df033db091f (diff) | |
am dd79f815: Animate InCallUI dialpad.
* commit 'dd79f815edd15d5ccea31c10ee5dd8f3b5873d05':
Animate InCallUI dialpad.
| -rw-r--r-- | InCallUI/res/anim/incall_dialpad_slide_in.xml | 7 | ||||
| -rw-r--r-- | InCallUI/res/anim/incall_dialpad_slide_out.xml | 7 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 11 |
3 files changed, 17 insertions, 8 deletions
diff --git a/InCallUI/res/anim/incall_dialpad_slide_in.xml b/InCallUI/res/anim/incall_dialpad_slide_in.xml index 89f4552ab..0e8ffce1f 100644 --- a/InCallUI/res/anim/incall_dialpad_slide_in.xml +++ b/InCallUI/res/anim/incall_dialpad_slide_in.xml @@ -13,11 +13,10 @@ 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" +<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/fast_out_slow_in" android:valueFrom="1.0" android:valueTo="0" android:valueType="floatType" android:propertyName="yFraction" - android:duration="200" />
\ No newline at end of file + android:duration="666" />
\ 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 index 7fa03a252..313e0b2a3 100644 --- a/InCallUI/res/anim/incall_dialpad_slide_out.xml +++ b/InCallUI/res/anim/incall_dialpad_slide_out.xml @@ -13,11 +13,10 @@ 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" +<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/fast_out_slow_in" android:valueFrom="0" android:valueTo="1.0" android:valueType="floatType" android:propertyName="yFraction" - android:duration="200" />
\ No newline at end of file + android:duration="426" />
\ 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 2f3b04bc1..c0616ba74 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -490,6 +490,17 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese } @Override + public void onHiddenChanged(boolean hidden) { + super.onHiddenChanged(hidden); + final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view); + if (hidden) { + dialpadView.animateHide(); + } else { + dialpadView.animateShow(); + } + } + + @Override public void appendDigitsToField(char digit) { if (mDtmfDialerField != null) { // TODO: maybe *don't* manually append this digit if |