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

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

@@ -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

@@ -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>
 
     <!-- =============================== -->