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

Commit 78adf767 authored by Jacqueline Bronger's avatar Jacqueline Bronger
Browse files

Add shrinking animation to the tv privacy chip. 

Updated to match ux design: icons shrinking to a dot design after a few
seconds.

Bug: 186718078
Test: manual + atest CameraMicindicatorsPermissionTest + atest
MicIndicatorTest

Change-Id: If032c235cb5ef124fb48523796ce09f5784e50e0
parent b3db2879

packages/SystemUI/res/anim/tv_privacy_chip_collapse.xml

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

<!--

  ~ Copyright (C) 2021 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"

     android:ordering="together"

     android:interpolator="@interpolator/tv_privacy_chip_collapse_interpolator"

     android:duration="@integer/privacy_chip_animation_millis">

    <objectAnimator

        android:propertyName="height"

        android:valueTo="@dimen/privacy_chip_dot_size"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="marginEnd"

        android:valueTo="@dimen/privacy_chip_dot_margin_horizontal"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="radius"

        android:valueTo="@dimen/privacy_chip_dot_radius"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="dotAlpha"

        android:valueTo="255"

        android:valueType="intType"/>

    <objectAnimator

        android:propertyName="bgAlpha"

        android:valueTo="255"

        android:valueType="intType"/>

</set>
 
 No newline at end of file

packages/SystemUI/res/anim/tv_privacy_chip_expand.xml

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

<!--

  ~ Copyright (C) 2021 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"

     android:ordering="together"

     android:interpolator="@interpolator/tv_privacy_chip_expand_interpolator"

     android:duration="@integer/privacy_chip_animation_millis">

    <objectAnimator

        android:propertyName="height"

        android:valueTo="@dimen/privacy_chip_height"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="marginEnd"

        android:valueTo="0"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="radius"

        android:valueTo="@dimen/privacy_chip_radius"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="dotAlpha"

        android:valueTo="255"

        android:valueType="intType"/>

    <objectAnimator

        android:propertyName="bgAlpha"

        android:valueTo="0"

        android:valueType="intType"/>

</set>
 
 No newline at end of file

packages/SystemUI/res/anim/tv_privacy_chip_fade_in.xml

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

<!--

  ~ Copyright (C) 2021 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"

     android:ordering="together"

     android:interpolator="@interpolator/tv_privacy_chip_collapse_interpolator"

     android:duration="@integer/privacy_chip_animation_millis">

    <objectAnimator

        android:propertyName="dotAlpha"

        android:valueTo="255"

        android:valueType="intType"/>

</set>
 
 No newline at end of file

packages/SystemUI/res/anim/tv_privacy_chip_fade_out.xml

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

<!--

  ~ Copyright (C) 2021 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"

     android:ordering="together"

     android:interpolator="@interpolator/tv_privacy_chip_collapse_interpolator"

     android:duration="@integer/privacy_chip_animation_millis">

    <objectAnimator

        android:propertyName="dotAlpha"

        android:valueTo="0"

        android:valueType="intType"/>

    <objectAnimator

        android:propertyName="bgAlpha"

        android:valueTo="0"

        android:valueType="intType"/>

</set>
 
 No newline at end of file

packages/SystemUI/res/drawable/tv_rect_shadow_rounded.xml→packages/SystemUI/res/interpolator/tv_privacy_chip_collapse_interpolator.xml

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

<!--

  ~ Copyright (C) 2019 The Android Open Source Project

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

  -->



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

       android:shape="rectangle">



    <corners android:radius="20dp"/>

    <solid android:color="@color/tv_audio_recording_indicator_icon_background"/>

    <stroke android:width="1dp" android:color="@color/tv_audio_recording_indicator_stroke"/>



</shape>
 
 No newline at end of file
 
<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"

                  android:controlX1="0.4"

                  android:controlY1="1.00"

                  android:controlX2="0.12"

                  android:controlY2="1.00"/>
 
 No newline at end of file