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

Commit dd98d3cf authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Remove QS wifi alpha state animations, they need more work" into oc-dev 

am: 3e5204a2

Change-Id: I3b85d04cc029b920b0f122094546b335b10afa01
parents ae8dec40 3e5204a2

packages/SystemUI/res/drawable/ic_qs_wifi_disabled.xml

+4 −2
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ Copyright (C) 2014 The Android Open Source Project 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M17.500000,16.500000L5.800000,3.400000c0.000000,0.000000 0.000000,0.000000 0.000000,0.000000l-2.700000,-3.000000L1.600000,1.800000l2.200000,2.500000c-2.000000,1.000000 -3.200000,2.000000 -3.400000,2.200000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l3.200000,-3.900000l2.400000,2.700000l1.500000,-1.400000L17.500000,16.500000L17.500000,16.500000z"/>

        android:pathData="M17.500000,16.500000L5.800000,3.400000c0.000000,0.000000 0.000000,0.000000 0.000000,0.000000l-2.700000,-3.000000L1.600000,1.800000l2.200000,2.500000c-2.000000,1.000000 -3.200000,2.000000 -3.400000,2.200000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l3.200000,-3.900000l2.400000,2.700000l1.500000,-1.400000L17.500000,16.500000L17.500000,16.500000z"

        android:fillAlpha=".3"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000c-1.900000,0.000000 -3.600000,0.300000 -5.200000,0.700000L18.700001,15.000000L25.600000,6.500000z"/>

        android:pathData="M25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000c-1.900000,0.000000 -3.600000,0.300000 -5.200000,0.700000L18.700001,15.000000L25.600000,6.500000z"

        android:fillAlpha=".3"/>

</vector>

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public class WifiTile extends QSTileImpl<SignalState> { 
        state.dualLabelContentDescription = r.getString(

                R.string.accessibility_quick_settings_open_settings, getTileLabel());

        state.expandedAccessibilityClassName = Switch.class.getName();

        state.state = state.value || cb.isTransient ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;

        state.state = Tile.STATE_ACTIVE;

    }



    @Override