Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afa9d6d8 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add theme aware key popup preview animation" into lmp-dev

parents f4383ed3 ac88f3d8

java/res/anim/key_preview_dismiss_holo.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android">

    <objectAnimator

        android:propertyName="scaleX"

        android:duration="53"

        android:valueFrom="1.00"

        android:valueTo="0.94" />

    <objectAnimator

        android:propertyName="scaleY"

        android:duration="53"

        android:valueFrom="1.00"

        android:valueTo="0.94" />

</set>

java/res/anim/key_preview_dismiss_lxx.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android">

    <objectAnimator

        android:propertyName="scaleX"

        android:duration="53"

        android:valueFrom="1.00"

        android:valueTo="1.00" />

    <objectAnimator

        android:propertyName="scaleY"

        android:duration="53"

        android:valueFrom="1.00"

        android:valueTo="0.94" />

</set>

java/res/anim/key_preview_show_up_holo.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android">

    <objectAnimator

        android:propertyName="scaleX"

        android:duration="17"

        android:valueFrom="0.98"

        android:valueTo="1.00" />

    <objectAnimator

        android:propertyName="scaleY"

        android:duration="17"

        android:valueFrom="0.98"

        android:valueTo="1.00" />

</set>

java/res/anim/key_preview_show_up_lxx.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android">

    <objectAnimator

        android:propertyName="scaleX"

        android:duration="17"

        android:valueFrom="1.00"

        android:valueTo="1.00" />

    <objectAnimator

        android:propertyName="scaleY"

        android:duration="17"

        android:valueFrom="0.98"

        android:valueTo="1.00" />

</set>

java/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ 
        <!-- TODO: consolidate key preview linger timeout with the key preview animation parameters. -->

        <!-- Delay after key releasing and key press feedback dismissing in millisecond -->

        <attr name="keyPreviewLingerTimeout" format="integer" />

        <!-- Key preview show up animator -->

        <attr name="keyPreviewShowUpAnimator" format="reference" />

        <!-- Key preview dismiss animator -->

        <attr name="keyPreviewDismissAnimator" format="reference" />

        <!-- Layout resource for more keys keyboard -->

        <attr name="moreKeysKeyboardLayout" format="reference" />

        <attr name="backgroundDimAlpha" format="integer" />