diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-12-03 07:06:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-03 07:06:22 -0800 |
| commit | 8ea94173388bcd1bd0f21b4783f1e214276c1cba (patch) | |
| tree | ad07b92e27fdbc2e8714a496ee2189a9d2fa75b4 /packages | |
| parent | fb60f1f233cd914f7425d7cda7c60c2c863dbb70 (diff) | |
| parent | 56f0d47ed86f9eb483db4f464971b2e17743b87d (diff) | |
| download | frameworks_base-8ea94173388bcd1bd0f21b4783f1e214276c1cba.zip frameworks_base-8ea94173388bcd1bd0f21b4783f1e214276c1cba.tar.gz frameworks_base-8ea94173388bcd1bd0f21b4783f1e214276c1cba.tar.bz2 | |
am 56f0d47e: am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev
* commit '56f0d47ed86f9eb483db4f464971b2e17743b87d':
Fix rounding error when drawing panel handles.
Diffstat (limited to 'packages')
| -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)); |