diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-08 13:49:08 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-05-08 13:49:12 -0700 |
commit | 3b4ddb795f36a6dd707f7864381b6df033db091f (patch) | |
tree | fb736215e5dcfb5278c9a84fce7c8c35b2997ae5 /InCallUI | |
parent | b448b50b5d1b44a890fbf83282a2246c95ad16ce (diff) |
Animate InCallUI dialpad.
- Change animations to use path interpolator.
- Invoke animations on the dialpad view from the dialpad fragment.
Bug: 14471388
Change-Id: I4b1bf59c3f612da503bdebccbda6a682748c5d49
Diffstat (limited to 'InCallUI')
-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 d22b9030c..df1681c31 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 |