summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2009-10-20 11:29:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-20 11:29:26 -0700
commit32de91306233b08604ce7a158a37235c7042ae13 (patch)
tree46c9d51e32dc3fc1be460067ab69772d3fd0838b /core/res
parent12a19551dd106b04898d262807213ce4c6d1e5f7 (diff)
parentcdc8b326dd0989003e2fdd7d5a605b5755acf221 (diff)
downloadframeworks_base-32de91306233b08604ce7a158a37235c7042ae13.zip
frameworks_base-32de91306233b08604ce7a158a37235c7042ae13.tar.gz
frameworks_base-32de91306233b08604ce7a158a37235c7042ae13.tar.bz2
am cdc8b326: Merge change I61741f5a into eclair
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2 * commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221': Fix high density bug 2179543: use 'dip' instead of 'px'
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/layout/media_controller.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/layout/media_controller.xml b/core/res/res/layout/media_controller.xml
index c49835d..32db60a 100644
--- a/core/res/res/layout/media_controller.xml
+++ b/core/res/res/layout/media_controller.xml
@@ -59,7 +59,7 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dip"
android:layout_weight="1"
- android:layout_height="30px"
+ android:layout_height="30dip"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true" />