Merge change 8097
* changes:
Fix the music app's repeating button.
diff --git a/res/layout-finger/audio_player_common.xml b/res/layout-finger/audio_player_common.xml
index 95320d9..6e14f75 100644
--- a/res/layout-finger/audio_player_common.xml
+++ b/res/layout-finger/audio_player_common.xml
@@ -25,8 +25,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#ff5a5a5a"
- android:paddingTop="1px"
- android:paddingBottom="4px"
+ android:paddingTop="1dip"
+ android:paddingBottom="4dip"
android:orientation="horizontal">
<TextView android:id="@+id/currenttime"
@@ -40,7 +40,7 @@
android:layout_gravity="bottom"
android:layout_weight="1"
android:layout_width="0dip"
- android:paddingLeft="5px"
+ android:paddingLeft="5dip"
android:layout_height="wrap_content" />
<LinearLayout
@@ -48,8 +48,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="bottom"
- android:layout_marginTop="1px"
- android:layout_marginBottom="2px"
+ android:layout_marginTop="1dip"
+ android:layout_marginBottom="2dip"
android:gravity="center">
<com.android.music.RepeatingImageButton android:id="@+id/prev" style="@android:style/MediaButton.Previous" />
@@ -69,7 +69,7 @@
android:shadowDy="0"
android:shadowRadius="3"
android:gravity="right"
- android:paddingRight="5px"
+ android:paddingRight="5dip"
android:layout_gravity="bottom"
android:layout_weight="1"
android:layout_width="0dip"
@@ -81,9 +81,9 @@
android:background="#ff5a5a5a"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
- android:layout_height="36px"
- android:paddingLeft="5px"
- android:paddingRight="5px"
- android:paddingBottom="4px" />
+ android:layout_height="36dip"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ android:paddingBottom="4dip" />
</merge>
diff --git a/res/layout-finger/confirm_delete.xml b/res/layout-finger/confirm_delete.xml
index be8d7ec..1fdf3fc 100644
--- a/res/layout-finger/confirm_delete.xml
+++ b/res/layout-finger/confirm_delete.xml
@@ -31,17 +31,17 @@
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="6px"
+ android:padding="6dip"
android:background="#ffffff" >
<Button android:id="@+id/delete"
- android:layout_width="120px" android:layout_height="wrap_content"
+ android:layout_width="120dip" android:layout_height="wrap_content"
android:text="@string/delete_confirm_button_text"
android:layout_gravity="center_horizontal"
android:layout_alignParentLeft="true" />
<Button android:id="@+id/cancel"
- android:layout_width="120px" android:layout_height="wrap_content"
+ android:layout_width="120dip" android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_alignParentRight="true" />
diff --git a/res/layout-finger/weekpicker.xml b/res/layout-finger/weekpicker.xml
index 00ced6f..053a1e2 100644
--- a/res/layout-finger/weekpicker.xml
+++ b/res/layout-finger/weekpicker.xml
@@ -39,25 +39,25 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="6px"
- android:layout_marginBottom="6px"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip"
/>
<!-- Set button -->
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="6px"
+ android:padding="6dip"
android:background="#ffffff" >
<Button android:id="@+id/set"
- android:layout_width="120px"
+ android:layout_width="120dip"
android:layout_height="wrap_content"
android:text="@string/weekpicker_set"
android:layout_alignParentLeft="true" />
<Button android:id="@+id/cancel"
- android:layout_width="120px"
+ android:layout_width="120dip"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_alignParentRight="true" />
diff --git a/res/layout-keysexposed/create_playlist.xml b/res/layout-keysexposed/create_playlist.xml
index 1bf2252..9a91a46 100644
--- a/res/layout-keysexposed/create_playlist.xml
+++ b/res/layout-keysexposed/create_playlist.xml
@@ -40,16 +40,16 @@
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="6px"
+ android:padding="6dip"
android:background="#ffffff" >
<Button android:id="@+id/create"
- android:layout_width="120px" android:layout_height="wrap_content"
+ android:layout_width="120dip" android:layout_height="wrap_content"
android:text="@string/create_playlist_create_text"
android:layout_alignParentLeft="true" />
<Button android:id="@+id/cancel"
- android:layout_width="120px" android:layout_height="wrap_content"
+ android:layout_width="120dip" android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_alignParentRight="true" />
diff --git a/res/layout-keyshidden/create_playlist.xml b/res/layout-keyshidden/create_playlist.xml
index bb5c6ac..675228b 100644
--- a/res/layout-keyshidden/create_playlist.xml
+++ b/res/layout-keyshidden/create_playlist.xml
@@ -51,16 +51,16 @@
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="6px"
+ android:padding="6dip"
android:background="#ffffff" >
<Button android:id="@+id/create"
- android:layout_width="120px" android:layout_height="wrap_content"
+ android:layout_width="120dip" android:layout_height="wrap_content"
android:text="@string/create_playlist_create_text"
android:layout_alignParentLeft="true" />
<Button android:id="@+id/cancel"
- android:layout_width="120px" android:layout_height="wrap_content"
+ android:layout_width="120dip" android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_alignParentRight="true" />
diff --git a/res/layout/scanning.xml b/res/layout/scanning.xml
index ff3caa6..c4aa9ad 100644
--- a/res/layout/scanning.xml
+++ b/res/layout/scanning.xml
@@ -18,7 +18,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="12px">
+ android:padding="12dip">
<ProgressBar android:id="@+id/spinner"
style="?android:attr/progressBarStyleLarge"