diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-12-03 07:00:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-03 07:00:59 -0800 |
| commit | 025b43cd51580701221ad74d24276498418fce37 (patch) | |
| tree | 522a8a971c8507b8faa7abd701b85f4bd4cb0ac3 /packages/SystemUI/src/com/android/systemui/statusbar/phone | |
| parent | 16cf643694194176954b709e5ee4dfcb711f2a57 (diff) | |
| parent | 076324ae191469737afa5bbec577a718f3a31886 (diff) | |
| download | frameworks_base-025b43cd51580701221ad74d24276498418fce37.zip frameworks_base-025b43cd51580701221ad74d24276498418fce37.tar.gz frameworks_base-025b43cd51580701221ad74d24276498418fce37.tar.bz2 | |
Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 248a516..2bad353 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -31,7 +31,7 @@ import com.android.systemui.statusbar.GestureRecorder; public class NotificationPanelView extends PanelView { Drawable mHandleBar; - float mHandleBarHeight; + int mHandleBarHeight; View mHandleView; int mFingers; PhoneStatusBar mStatusBar; @@ -51,7 +51,7 @@ public class NotificationPanelView extends PanelView { Resources resources = getContext().getResources(); mHandleBar = resources.getDrawable(R.drawable.status_bar_close); - mHandleBarHeight = resources.getDimension(R.dimen.close_handle_height); + mHandleBarHeight = resources.getDimensionPixelSize(R.dimen.close_handle_height); mHandleView = findViewById(R.id.handle); setContentDescription(resources.getString(R.string.accessibility_desc_notification_shade)); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java index a58eb22..bbb8455 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java @@ -41,7 +41,7 @@ public class SettingsPanelView extends PanelView { private QuickSettingsContainerView mQSContainer; Drawable mHandleBar; - float mHandleBarHeight; + int mHandleBarHeight; View mHandleView; public SettingsPanelView(Context context, AttributeSet attrs) { @@ -56,7 +56,7 @@ public class SettingsPanelView extends PanelView { Resources resources = getContext().getResources(); mHandleBar = resources.getDrawable(R.drawable.status_bar_close); - mHandleBarHeight = resources.getDimension(R.dimen.close_handle_height); + mHandleBarHeight = resources.getDimensionPixelSize(R.dimen.close_handle_height); mHandleView = findViewById(R.id.handle); setContentDescription(resources.getString(R.string.accessibility_desc_quick_settings)); |