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

Commit ca476166 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 0e14f2d4: Merge "Remove obsolete MultiWaveView" 

* commit '0e14f2d4':
  Remove obsolete MultiWaveView
parents 1c9c97c5 0e14f2d4

core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

deleted100644 → 0
+0 −1270

File deleted.

Preview size limit exceeded, changes collapsed.

core/res/res/values/attrs.xml

+9 −48
Original line number Diff line number Diff line
@@ -6033,16 +6033,16 @@ 
    <eat-comment />

    <declare-styleable name="GlowPadView">

        <!-- Reference to an array resource that be shown as targets around a circle. -->

        <attr name="targetDrawables"/>

        <attr name="targetDrawables" format="reference" />



        <!-- Reference to an array resource that be used as description for the targets around the circle. -->

        <attr name="targetDescriptions"/>

        <attr name="targetDescriptions" format="reference" />



        <!-- Reference to an array resource that be used to announce the directions with targets around the circle. -->

        <attr name="directionDescriptions"/>

        <attr name="directionDescriptions" format="reference" />



        <!-- Sets a drawable as the center. -->

        <attr name="handleDrawable"/>

        <attr name="handleDrawable" format="reference" />



        <!-- Drawable to use for wave ripple animation. -->

        <attr name="outerRingDrawable" format="reference"/>
@@ -6054,22 +6054,22 @@ 
        <attr name="innerRadius"/>



        <!-- Outer radius of glow area. Target icons will be drawn on this circle. -->

        <attr name="outerRadius"/>

        <attr name="outerRadius" format="dimension" />



        <!-- Radius of glow under finger. -->

        <attr name="glowRadius" format="dimension" />



        <!-- Tactile feedback duration for actions. Set to '0' for no vibration. -->

        <attr name="vibrationDuration"/>

        <attr name="vibrationDuration" format="integer" />



        <!-- How close we need to be before snapping to a target. -->

        <attr name="snapMargin"/>

        <attr name="snapMargin" format="dimension" />



        <!-- Number of waves/chevrons to show in animation. -->

        <attr name="feedbackCount"/>

        <attr name="feedbackCount" format="integer" />



        <!-- Used when the handle shouldn't wait to be hit before following the finger -->

        <attr name="alwaysTrackFinger"/>

        <attr name="alwaysTrackFinger" format="boolean" />



        <!-- Location along the circle of the first item, in degrees.-->

        <attr name="firstItemOffset" format="float" />
@@ -6085,45 +6085,6 @@ 
        <attr name="allowScaling" format="boolean" />

    </declare-styleable>



    <!-- =============================== -->

    <!-- MultiWaveView class attributes -->

    <!-- =============================== -->

    <eat-comment />

    <declare-styleable name="MultiWaveView">

        <!-- Reference to an array resource that be shown as targets around a circle. -->

        <attr name="targetDrawables" format="reference"/>



        <!-- Reference to an array resource that be used as description for the targets around the circle. -->

        <attr name="targetDescriptions" format="reference"/>



        <!-- Reference to an array resource that be used to announce the directions with targets around the circle. -->

        <attr name="directionDescriptions" format="reference"/>



        <!-- Sets a drawable as the drag center. -->

        <attr name="handleDrawable" format="reference" />



        <!-- Drawables to use for chevron animations. May be null. -->

        <attr name="chevronDrawables" format="reference"/>



        <!-- Drawable to use for wave ripple animation. -->

        <attr name="waveDrawable" format="reference" />



        <!-- Outer radius of target circle. Icons will be drawn on this circle. -->

        <attr name="outerRadius" format="dimension" />



        <!-- Tactile feedback duration for actions. Set to '0' for no vibration. -->

        <attr name="vibrationDuration" format="integer"/>



        <!-- How close we need to be before snapping to a target. -->

        <attr name="snapMargin" format="dimension" />



        <!-- Number of waves/chevrons to show in animation. -->

        <attr name="feedbackCount" format="integer" />



        <!-- Used when the handle shouldn't wait to be hit before following the finger -->

        <attr name="alwaysTrackFinger" format="boolean" />

    </declare-styleable>



    <!-- =============================== -->

    <!-- SizeAdaptiveLayout class attributes -->

    <!-- =============================== -->

packages/SystemUI/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ 
    <!-- Amount of time to hold off before showing the search panel when the user presses home -->

    <integer name="config_show_search_delay">200</integer>



    <!-- Vibration duration for MultiWaveView used in SearchPanelView -->

    <!-- Vibration duration for GlowPadView used in SearchPanelView -->

    <integer translatable="false" name="config_vibration_duration">0</integer>



    <!-- Vibration duration for MultiWaveView used in SearchPanelView -->

    <!-- Vibration duration for GlowPadView used in SearchPanelView -->

    <integer translatable="false" name="config_search_panel_view_vibration_duration">20</integer>



    <!-- The length of the vibration when the notification pops open. -->