diff options
| author | Adam Powell <adamp@google.com> | 2012-10-23 16:09:29 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2012-10-23 16:09:40 -0700 |
| commit | 962159addd6705d11bdd4c0fa3b83c0b7d95b28a (patch) | |
| tree | 59881690d3f6241d665bb12d793fc269890ae77d /core | |
| parent | 83b9647d1662c45712ce10d62efad28ad0b0eff6 (diff) | |
| download | frameworks_base-962159addd6705d11bdd4c0fa3b83c0b7d95b28a.zip frameworks_base-962159addd6705d11bdd4c0fa3b83c0b7d95b28a.tar.gz frameworks_base-962159addd6705d11bdd4c0fa3b83c0b7d95b28a.tar.bz2 | |
Fix up GlowPadView attributes
Change-Id: I98c14177753e713fcdaaf886c44ce10ab49eebc9
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/multiwaveview/GlowPadView.java | 5 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java index 0f49776..b7f64ec 100644 --- a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java +++ b/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); diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 6656de0..b942ad9 100755 --- a/core/res/res/values/attrs.xml +++ b/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> <!-- =============================== --> |