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

Commit 848a5557 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev

parents 19a52670 962159ad

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

+1 −4
Original line number Diff line number Diff line
@@ -256,11 +256,8 @@ public class GlowPadView extends View { 
            setDirectionDescriptionsResourceId(resourceId);

        }



        a.recycle();

        mGravity = a.getInt(R.styleable.GlowPadView_gravity, Gravity.TOP);



        // Use gravity attribute from LinearLayout

        a = context.obtainStyledAttributes(attrs, android.R.styleable.LinearLayout);

        mGravity = a.getInt(android.R.styleable.LinearLayout_gravity, Gravity.TOP);

        a.recycle();



        setVibrateEnabled(mVibrationDuration > 0);

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -5464,6 +5464,8 @@ 


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

        <attr name="alwaysTrackFinger"/>



        <attr name="gravity" />

    </declare-styleable>



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