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

Commit e318a467 authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix checkbox animation end colors 

Uses a themed color state list so that even though the animations will
end showing the same drawable that they started from, and therefore the
same tint, the correct color will be displayed based on the state. Also
renames the checkbox assets so it's easier to figure out which one is
going in which direction.

Bug: 20733852
Change-Id: I1e8331d9f035595953db6df3b28b766db3617e1c
parent 5551aca2

core/res/res/anim/ic_checkbox_unchecked_box_inner_merged_animation.xml→core/res/res/anim/ic_checkbox_to_checked_box_inner_merged_animation.xml

+3 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 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.
@@ -15,8 +14,7 @@ 
     limitations under the License.

-->



<set

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

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

    <objectAnimator

        android:duration="166"

        android:propertyName="pathData"
@@ -24,8 +22,7 @@ 
        android:valueTo="M 0.0,-0.05 l 0.0,0.0 c 0.02761423749,0.0 0.05,0.02238576251 0.05,0.05 l 0.0,0.0 c 0.0,0.02761423749 -0.02238576251,0.05 -0.05,0.05 l 0.0,0.0 c -0.02761423749,0.0 -0.05,-0.02238576251 -0.05,-0.05 l 0.0,0.0 c 0.0,-0.02761423749 0.02238576251,-0.05 0.05,-0.05 Z M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

        android:valueType="pathType"

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

    <set

        android:ordering="sequentially" >

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="166"

            android:propertyName="fillAlpha"

core/res/res/anim/ic_checkbox_unchecked_box_outer_merged_animation.xml→core/res/res/anim/ic_checkbox_to_checked_box_outer_merged_animation.xml

+4 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 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.
@@ -15,10 +14,8 @@ 
     limitations under the License.

-->



<set

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

    <set

        android:ordering="sequentially" >

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

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="200"

            android:propertyName="pathData"
@@ -34,8 +31,7 @@ 
            android:valueType="pathType"

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

    </set>

    <set

        android:ordering="sequentially" >

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="166"

            android:propertyName="fillAlpha"

core/res/res/anim/ic_checkbox_unchecked_icon_null_animation.xml→core/res/res/anim/ic_checkbox_to_checked_icon_null_animation.xml

+4 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 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.
@@ -15,10 +14,8 @@ 
     limitations under the License.

-->



<set

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

    <set

        android:ordering="sequentially" >

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

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="200"

            android:propertyName="scaleX"
@@ -32,8 +29,7 @@ 
            android:valueTo="0.2"

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

    </set>

    <set

        android:ordering="sequentially" >

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="200"

            android:propertyName="scaleY"

core/res/res/anim/ic_checkbox_checked_box_inner_merged_animation.xml→core/res/res/anim/ic_checkbox_to_unchecked_box_inner_merged_animation.xml

+4 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 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.
@@ -15,10 +14,8 @@ 
     limitations under the License.

-->



<set

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

    <set

        android:ordering="sequentially" >

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

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="166"

            android:propertyName="pathData"
@@ -34,8 +31,7 @@ 
            android:valueType="pathType"

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

    </set>

    <set

        android:ordering="sequentially" >

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="133"

            android:propertyName="fillAlpha"

core/res/res/anim/ic_checkbox_checked_check_path_merged_animation.xml→core/res/res/anim/ic_checkbox_to_unchecked_check_path_merged_animation.xml

+3 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 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.
@@ -15,8 +14,7 @@ 
     limitations under the License.

-->



<set

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

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

    <objectAnimator

        android:duration="166"

        android:propertyName="pathData"
@@ -24,8 +22,7 @@ 
        android:valueTo="M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M 0.0,1.42500305176 c 0.0,0.0 -1.4234161377,-1.40159606934 -1.4234161377,-1.40159606934 c 0.0,0.0 1.41409301758,-1.41409301758 1.41409301758,-1.41409301758 c 0.0,0.0 0.00932312011719,-0.0124053955078 0.00932312011719,-0.0124053955078 c 0.0,0.0 0.0234069824219,-0.0235137939453 0.0234069824219,-0.0235137939453 c 0.0,0.0 1.41409301758,1.41409301758 1.41409301758,1.41409301758 c 0.0,0.0 -1.4375,1.43751525879 -1.4375,1.43751525879 Z"

        android:valueType="pathType"

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

    <set

        android:ordering="sequentially" >

    <set android:ordering="sequentially" >

        <objectAnimator

            android:duration="133"

            android:propertyName="fillAlpha"