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

Commit 110e5f6c authored by Jason Monk's avatar Jason Monk
Browse files

QS: Add transient animations for bluetooth and wifi 

Test: runtest systemui
Change-Id: I04a81e1b36a6595bfb102603ad07b079c8b0ee77
Fixes: 26781226
parent e645aee4

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

+9 −0
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ public class WifiStatusTracker { 


    private final WifiManager mWifiManager;

    public boolean enabled;

    public int state;

    public boolean connected;

    public boolean connecting;

    public String ssid;

    public int rssi;

    public int level;
@@ -39,11 +41,18 @@ public class WifiStatusTracker { 
    public void handleBroadcast(Intent intent) {

        String action = intent.getAction();

        if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {

            state = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,

                    WifiManager.WIFI_STATE_UNKNOWN);

            enabled = state == WifiManager.WIFI_STATE_ENABLED;





            enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,

                    WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED;

        } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {

            final NetworkInfo networkInfo = (NetworkInfo)

                    intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);

            connecting = networkInfo != null && !networkInfo.isConnected()

                    && networkInfo.isConnectedOrConnecting();

            connected = networkInfo != null && networkInfo.isConnected();

            WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null

                    ? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO)

packages/SystemUI/res/anim/ic_bluetooth_transient_group_1_animation.xml

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

<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleX"

            android:valueFrom="1.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleX"

            android:valueFrom="0.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleX"

            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleX"

            android:valueFrom="1.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleY"

            android:valueFrom="1.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleY"

            android:valueFrom="0.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleY"

            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

    </set>

</set>

packages/SystemUI/res/anim/ic_bluetooth_transient_group_2_animation.xml

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

<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleX"

            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleX"

            android:valueFrom="1.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleX"

            android:valueFrom="1.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleY"

            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleY"

            android:valueFrom="1.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="83"

            android:propertyName="scaleY"

            android:valueFrom="1.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

    </set>

</set>

packages/SystemUI/res/anim/ic_signal_wifi_transient_wifi_1_animation.xml

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

<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="333"

            android:propertyName="pathData"

            android:valueFrom="M 0.0169982910156,18.4394989014 c 0.0,0.0 23.2140045166,-28.766998291 23.2140045166,-28.766998291 c -0.900009155273,-0.675003051758 -9.82899475098,-8.13400268555 -23.2320098877,-8.13400268555 c -13.4029998779,0.0 -22.3299865723,7.45899963379 -23.2299957275,8.13400268555 c 0.0,0.0 23.2140045166,28.766998291 23.2140045166,28.766998291 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueTo="M 0.0169982910156,18.4394989014 c 0.0,0.0 23.2140045166,-28.766998291 23.2140045166,-28.766998291 c -0.900009155273,-0.675003051758 -9.82899475098,-8.13400268555 -23.2320098877,-8.13400268555 c -13.4029998779,0.0 -22.3299865723,7.45899963379 -23.2299957275,8.13400268555 c 0.0,0.0 23.2140045166,28.766998291 23.2140045166,28.766998291 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueType="pathType"

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

        <objectAnimator

            android:duration="16"

            android:propertyName="pathData"

            android:valueFrom="M 0.0169982910156,18.4394989014 c 0.0,0.0 23.2140045166,-28.766998291 23.2140045166,-28.766998291 c -0.900009155273,-0.675003051758 -9.82899475098,-8.13400268555 -23.2320098877,-8.13400268555 c -13.4029998779,0.0 -22.3299865723,7.45899963379 -23.2299957275,8.13400268555 c 0.0,0.0 23.2140045166,28.766998291 23.2140045166,28.766998291 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueTo="M 0.0169982910156,18.4394989014 c 0.0,0.0 9.55569458008,-11.8414916992 9.55569458008,-11.8414916992 c 0.0,0.0 -3.32373046875,-3.83329772949 -9.59307861328,-3.7864074707 c -6.26933288574,0.046875 -9.61039733887,3.71441650391 -9.61039733887,3.71441650391 c 0.0,0.0 9.61378479004,11.913482666 9.61378479004,11.913482666 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueType="pathType"

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

        <objectAnimator

            android:duration="316"

            android:propertyName="pathData"

            android:valueFrom="M 0.0169982910156,18.4394989014 c 0.0,0.0 9.55569458008,-11.8414916992 9.55569458008,-11.8414916992 c 0.0,0.0 -3.32373046875,-3.83329772949 -9.59307861328,-3.7864074707 c -6.26933288574,0.046875 -9.61039733887,3.71441650391 -9.61039733887,3.71441650391 c 0.0,0.0 9.61378479004,11.913482666 9.61378479004,11.913482666 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueTo="M 0.0169982910156,18.4394989014 c 0.0,0.0 9.55569458008,-11.8414916992 9.55569458008,-11.8414916992 c 0.0,0.0 -3.32373046875,-3.83329772949 -9.59307861328,-3.7864074707 c -6.26933288574,0.046875 -9.61039733887,3.71441650391 -9.61039733887,3.71441650391 c 0.0,0.0 9.61378479004,11.913482666 9.61378479004,11.913482666 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueType="pathType"

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

        <objectAnimator

            android:duration="16"

            android:propertyName="pathData"

            android:valueFrom="M 0.0169982910156,18.4394989014 c 0.0,0.0 9.55569458008,-11.8414916992 9.55569458008,-11.8414916992 c 0.0,0.0 -3.32373046875,-3.83329772949 -9.59307861328,-3.7864074707 c -6.26933288574,0.046875 -9.61039733887,3.71441650391 -9.61039733887,3.71441650391 c 0.0,0.0 9.61378479004,11.913482666 9.61378479004,11.913482666 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueTo="M 0.0169982910156,18.4394989014 c 0.0,0.0 16.9385528564,-20.9904174805 16.9385528564,-20.9904174805 c -0.486480712891,-0.364868164062 -6.84008789062,-6.15798950195 -16.9654541016,-6.13645935059 c -10.1253662109,0.0215454101562 -16.4858551025,5.73852539062 -16.9723510742,6.10339355469 c 0.0,0.0 16.9652557373,21.0234832764 16.9652557373,21.0234832764 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueType="pathType"

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

        <objectAnimator

            android:duration="316"

            android:propertyName="pathData"

            android:valueFrom="M 0.0169982910156,18.4394989014 c 0.0,0.0 16.9385528564,-20.9904174805 16.9385528564,-20.9904174805 c -0.486480712891,-0.364868164062 -6.84008789062,-6.15798950195 -16.9654541016,-6.13645935059 c -10.1253662109,0.0215454101562 -16.4858551025,5.73852539062 -16.9723510742,6.10339355469 c 0.0,0.0 16.9652557373,21.0234832764 16.9652557373,21.0234832764 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueTo="M 0.0169982910156,18.4394989014 c 0.0,0.0 16.9385528564,-20.9904174805 16.9385528564,-20.9904174805 c -0.486480712891,-0.364868164062 -6.84008789062,-6.15798950195 -16.9654541016,-6.13645935059 c -10.1253662109,0.0215454101562 -16.4858551025,5.73852539062 -16.9723510742,6.10339355469 c 0.0,0.0 16.9652557373,21.0234832764 16.9652557373,21.0234832764 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueType="pathType"

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

        <objectAnimator

            android:duration="16"

            android:propertyName="pathData"

            android:valueFrom="M 0.0169982910156,18.4394989014 c 0.0,0.0 16.9385528564,-20.9904174805 16.9385528564,-20.9904174805 c -0.486480712891,-0.364868164062 -6.84008789062,-6.15798950195 -16.9654541016,-6.13645935059 c -10.1253662109,0.0215454101562 -16.4858551025,5.73852539062 -16.9723510742,6.10339355469 c 0.0,0.0 16.9652557373,21.0234832764 16.9652557373,21.0234832764 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueTo="M 0.0169982910156,18.4394989014 c 0.0,0.0 23.2140045166,-28.766998291 23.2140045166,-28.766998291 c -0.900009155273,-0.675003051758 -9.82899475098,-8.13400268555 -23.2320098877,-8.13400268555 c -13.4029998779,0.0 -22.3299865723,7.45899963379 -23.2299957275,8.13400268555 c 0.0,0.0 23.2140045166,28.766998291 23.2140045166,28.766998291 c 0.0,0.0 0.0159912109375,0.0220031738281 0.0159912109375,0.0220031738281 c 0.0,0.0 0.00100708007812,-0.00100708007812 0.00100708007812,-0.0010070800781 c 0.0,0.0 0.00100708007812,0.00100708007812 0.00100708007812,0.0010070800781 c 0.0,0.0 0.0159912109375,-0.0220031738281 0.0159912109375,-0.0220031738281 Z"

            android:valueType="pathType"

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="333"

            android:propertyName="fillAlpha"

            android:valueFrom="0.0"

            android:valueTo="0.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="16"

            android:propertyName="fillAlpha"

            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

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

    </set>

</set>

packages/SystemUI/res/drawable/ic_bluetooth_transient.xml

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

<vector

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

    android:name="ic_bluetooth_transient"

    android:width="48dp"

    android:viewportWidth="48"

    android:height="48dp"

    android:viewportHeight="48" >

    <group

        android:name="ic_signal_wifi_4_bar_48px_outlines_"

        android:translateX="21.9995"

        android:translateY="25.73401" >

        <group

            android:name="ic_signal_wifi_4_bar_48px_outlines__pivot"

            android:translateX="-23.21545"

            android:translateY="-18.86649" >

            <group

                android:name="bluetooth"

                android:translateX="22.08789"

                android:translateY="18.72031" >

                <group

                    android:name="bluetooth_pivot"

                    android:translateX="-22.08789"

                    android:translateY="-18.72031" >

                    <group

                        android:name="cross"

                        android:rotation="-1.88453" >

                        <path

                            android:name="extented_cross"

                            android:pathData="M 10.6188659668,6.56344604492 c 0.0,0.0 21.7386016846,23.1297454834 21.7386016846,23.1297454834"

                            android:strokeColor="#FFFFFFFF"

                            android:strokeWidth="4" />

                    </group>

                    <group

                        android:name="bluetooth_0"

                        android:translateX="23.38789"

                        android:translateY="18.72031" >

                        <path

                            android:name="b_shape_merged"

                            android:pathData="M 11.3999938965,-8.60000610352 c 0.0,0.0 -11.3999938965,-11.3999938965 -11.3999938965,-11.3999938965 c 0.0,0.0 -2.0,0.0 -2.0,0.0 c 0.0,0.0 0.0,15.1999969482 0.0,15.1999969482 c 0.0,0.0 -9.19999694824,-9.19999694824 -9.19999694824,-9.19999694824 c 0.0,0.0 -2.80000305176,2.80000305176 -2.80000305176,2.80000305176 c 0.0,0.0 11.1999969482,11.1999969482 11.1999969482,11.1999969482 c 0.0,0.0 -11.1999969482,11.1999969482 -11.1999969482,11.1999969482 c 0.0,0.0 2.80000305176,2.80000305176 2.80000305176,2.80000305176 c 0.0,0.0 9.19999694824,-9.19999694824 9.19999694824,-9.19999694824 c 0.0,0.0 0.0,15.1999969482 0.0,15.1999969482 c 0.0,0.0 2.0,0.0 2.0,0.0 c 0.0,0.0 11.3999938965,-11.3999938965 11.3999938965,-11.3999938965 c 0.0,0.0 -8.59999084473,-8.60000610352 -8.59999084473,-8.60000610352 c 0.0,0.0 8.59999084473,-8.60000610352 8.59999084473,-8.60000610352 Z M 2.0,-12.3000030518 c 0.0,0.0 3.80000305176,3.80000305176 3.80000305176,3.80000305176 c 0.0,0.0 -3.80000305176,3.69999694824 -3.80000305176,3.69999694824 c 0.0,0.0 0.0,-7.5 0.0,-7.5 Z M 5.80000305176,8.60000610352 c 0.0,0.0 -3.80000305176,3.69999694824 -3.80000305176,3.69999694824 c 0.0,0.0 0.0,-7.5 0.0,-7.5 c 0.0,0.0 3.80000305176,3.80000305176 3.80000305176,3.80000305176 Z"

                            android:fillColor="#FFFFFFFF" />

                    </group>

                </group>

            </group>

            <group

                android:name="dot_left"

                android:translateX="20.16992"

                android:translateY="18.64258" >

                <group

                    android:name="dot_left_pivot"

                    android:translateX="-20.16992"

                    android:translateY="-18.64258" >

                    <group

                        android:name="group_1"

                        android:translateX="9.38789"

                        android:translateY="18.72031" >

                        <group

                            android:name="group_1_pivot"

                            android:translateX="-9.38789"

                            android:translateY="-18.72031" >

                            <path

                                android:name="dot_left_0"

                                android:pathData="M 13.3878936768,18.7203063965 c 0.0,0.0 -4.0,-4.0 -4.0,-4.0 c 0.0,0.0 -4.0,4.0 -4.0,4.0 c 0.0,0.0 4.0,4.0 4.0,4.0 c 0.0,0.0 4.0,-4.0 4.0,-4.0 Z"

                                android:fillColor="#FFFFFFFF" />

                        </group>

                    </group>

                </group>

            </group>

            <group

                android:name="dot_right"

                android:translateX="26.16094"

                android:translateY="18.60898" >

                <group

                    android:name="dot_right_pivot"

                    android:translateX="-26.16094"

                    android:translateY="-18.60898" >

                    <group

                        android:name="group_2"

                        android:translateX="37.38789"

                        android:translateY="18.72031"

                        android:scaleX="0"

                        android:scaleY="0" >

                        <group

                            android:name="group_1_pivot_0"

                            android:translateX="-37.38789"

                            android:translateY="-18.72031" >

                            <path

                                android:name="dot_right_0"

                                android:pathData="M 37.3878936768,14.7203063965 c 0.0,0.0 -4.0,4.0 -4.0,4.0 c 0.0,0.0 4.0,4.0 4.0,4.0 c 0.0,0.0 4.0,-4.0 4.0,-4.0 c 0.0,0.0 -4.0,-4.0 -4.0,-4.0 Z"

                                android:fillColor="#FFFFFFFF" />

                        </group>

                    </group>

                </group>

            </group>

        </group>

    </group>

</vector>