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

Commit 7e29d1b4 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki
Browse files

FloatingToolbar polish. 

This patch updates the FloatingToolbar to look and transition
exactly as described in the UX spec.

It includes an animating (VectorDrawable) overflow button and
menu item buttons that sit in place during transitions.

Bug: 24257588
Change-Id: I2b3f84ba451800830878667ce1abd7a99b4f9fea
parent c93546ed

core/java/com/android/internal/widget/FloatingToolbar.java

+777 −653

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/anim/ft_avd_toarrow_rectangle_1_animation.xml

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

<!--

/* Copyright 2015, 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:duration="600"

        android:propertyXName="translateX"

        android:propertyYName="translateY"

        android:pathData="M -6.5,0.0 c 1.08333,-1.0 5.41667,-5.0 6.5,-6.0"

        android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_4" />

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="300"

            android:propertyName="rotation"

            android:valueFrom="-45.0"

            android:valueTo="-45.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="150"

            android:propertyName="rotation"

            android:valueFrom="-45.0"

            android:valueTo="0.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

    </set>

</set>

core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_0_animation.xml

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

<!--

/* Copyright 2015, 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:duration="200"

        android:propertyXName="translateX"

        android:propertyYName="translateY"

        android:pathData="M 0.0,0.0 c 0.75,0.0 3.75,0.0 4.5,0.0"

        android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_5" />

</set>

core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_animation.xml

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

<!--

/* Copyright 2015, 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:duration="450"

        android:propertyXName="translateX"

        android:propertyYName="translateY"

        android:pathData="M 4.5,0.0 c -0.75,0.0 -3.75,0.0 -4.5,0.0"

        android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_0" />

</set>

core/res/res/anim/ft_avd_toarrow_rectangle_2_animation.xml

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

<!--

/* Copyright 2015, 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:duration="600"

        android:propertyXName="translateX"

        android:propertyYName="translateY"

        android:pathData="M -8.0,0.0 c 1.33333,0.0 6.66667,0.0 8.0,0.0"

        android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_3" />

</set>