aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-07-16 18:12:36 -0700
committerScott Jackson <daneren2005@gmail.com>2014-07-16 18:12:36 -0700
commit3eaf90cd71fc9ab4ab48207b725c242ae212d2e8 (patch)
treee21bea364d091c743dab4da221070f4745c2aab7 /res
parent3f74c6b9523125ade8f93fe3803de0a36cf1b251 (diff)
parent7d42213e761b44d4a3071ccf31555acd2089b904 (diff)
downloaddsub-3eaf90cd71fc9ab4ab48207b725c242ae212d2e8.tar.gz
dsub-3eaf90cd71fc9ab4ab48207b725c242ae212d2e8.tar.bz2
dsub-3eaf90cd71fc9ab4ab48207b725c242ae212d2e8.zip
Merge branch 'GB'
Diffstat (limited to 'res')
-rw-r--r--res/layout/abstract_fragment_activity.xml2
-rw-r--r--res/layout/album_cell_item.xml2
-rw-r--r--res/layout/album_list_item.xml2
-rw-r--r--res/layout/appwidget4x1.xml8
-rw-r--r--res/layout/appwidget4x2.xml8
-rw-r--r--res/layout/appwidget4x3.xml8
-rw-r--r--res/layout/appwidget4x4.xml8
-rw-r--r--res/layout/basic_list_item.xml2
-rw-r--r--res/layout/complex_list_item.xml2
-rw-r--r--res/layout/notification.xml6
-rw-r--r--res/layout/notification_expanded.xml8
-rw-r--r--res/layout/select_album_header.xml2
-rw-r--r--res/layout/song_list_item.xml2
-rw-r--r--res/layout/user_list_item.xml2
-rw-r--r--res/values-v11/styles.xml6
-rw-r--r--res/values/styles.xml7
16 files changed, 42 insertions, 33 deletions
diff --git a/res/layout/abstract_fragment_activity.xml b/res/layout/abstract_fragment_activity.xml
index 5f3a592b..0702397f 100644
--- a/res/layout/abstract_fragment_activity.xml
+++ b/res/layout/abstract_fragment_activity.xml
@@ -15,7 +15,7 @@
android:id="@+id/bottom_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:orientation="horizontal">
<ImageView
diff --git a/res/layout/album_cell_item.xml b/res/layout/album_cell_item.xml
index 13fe9466..5f4735fe 100644
--- a/res/layout/album_cell_item.xml
+++ b/res/layout/album_cell_item.xml
@@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:paddingRight="2dp"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml
index 805c9033..aae87638 100644
--- a/res/layout/album_list_item.xml
+++ b/res/layout/album_list_item.xml
@@ -54,5 +54,5 @@
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
android:paddingRight="10dip"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</LinearLayout>
diff --git a/res/layout/appwidget4x1.xml b/res/layout/appwidget4x1.xml
index 5d75c9e9..8f52c872 100644
--- a/res/layout/appwidget4x1.xml
+++ b/res/layout/appwidget4x1.xml
@@ -30,7 +30,7 @@
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
- android:background="?android:selectableItemBackground">
+ style="@style/BasicButton">
<TextView
android:id="@+id/title"
@@ -81,7 +81,7 @@
android:layout_height="fill_parent"
android:layout_weight="1"
android:scaleType="center"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:src="@drawable/ic_appwidget_music_previous" />
<ImageButton
@@ -91,7 +91,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_play"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
<ImageButton
android:id="@+id/control_next"
@@ -100,7 +100,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_next"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/appwidget4x2.xml b/res/layout/appwidget4x2.xml
index 8ec61a59..5763fb01 100644
--- a/res/layout/appwidget4x2.xml
+++ b/res/layout/appwidget4x2.xml
@@ -32,7 +32,7 @@
android:orientation="vertical"
android:paddingTop="4dip"
android:paddingBottom="4dip"
- android:background="?android:selectableItemBackground">
+ style="@style/BasicButton">
<TextView
android:id="@+id/title"
@@ -104,7 +104,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="center"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:src="@drawable/ic_appwidget_music_previous" />
<ImageButton
@@ -114,7 +114,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_play"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
<ImageButton
android:id="@+id/control_next"
@@ -123,7 +123,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_next"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/appwidget4x3.xml b/res/layout/appwidget4x3.xml
index 1758602b..539b9f01 100644
--- a/res/layout/appwidget4x3.xml
+++ b/res/layout/appwidget4x3.xml
@@ -34,7 +34,7 @@
android:orientation="vertical"
android:paddingBottom="4dip"
android:paddingTop="4dip"
- android:background="?android:selectableItemBackground">
+ style="@style/BasicButton">
<TextView
android:id="@+id/title"
@@ -86,7 +86,7 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:src="@drawable/ic_appwidget_music_previous" />
<ImageButton
@@ -96,7 +96,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_play"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
<ImageButton
android:id="@+id/control_next"
@@ -105,7 +105,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_next"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/appwidget4x4.xml b/res/layout/appwidget4x4.xml
index b15a7339..1f2db9e1 100644
--- a/res/layout/appwidget4x4.xml
+++ b/res/layout/appwidget4x4.xml
@@ -35,7 +35,7 @@
android:orientation="vertical"
android:paddingTop="4dip"
android:paddingBottom="4dip"
- android:background="?android:selectableItemBackground">
+ style="@style/BasicButton">
<TextView
android:id="@+id/title"
@@ -88,7 +88,7 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:src="@drawable/ic_appwidget_music_previous" />
<ImageButton
@@ -98,7 +98,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_play"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
<ImageButton
android:id="@+id/control_next"
@@ -107,7 +107,7 @@
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/ic_appwidget_music_next"
- android:background="?android:selectableItemBackground" />
+ style="@style/BasicButton" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/basic_list_item.xml b/res/layout/basic_list_item.xml
index a49d0c3d..84526324 100644
--- a/res/layout/basic_list_item.xml
+++ b/res/layout/basic_list_item.xml
@@ -34,5 +34,5 @@
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
android:paddingRight="10dip"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/complex_list_item.xml b/res/layout/complex_list_item.xml
index 947b2ee0..421295f2 100644
--- a/res/layout/complex_list_item.xml
+++ b/res/layout/complex_list_item.xml
@@ -46,5 +46,5 @@
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
android:paddingRight="10dip"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index e4cec6fb..12efa4ec 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -51,7 +51,7 @@
<ImageButton
android:id="@+id/control_previous"
android:src="@drawable/notification_previous"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:layout_width="46dip"
android:layout_height="fill_parent"
android:layout_gravity="center|right"
@@ -62,7 +62,7 @@
<ImageButton
android:id="@+id/control_pause"
android:src="@drawable/notification_pause"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:layout_width="46dip"
android:layout_height="fill_parent"
android:layout_gravity="center|right"
@@ -73,7 +73,7 @@
<ImageButton
android:id="@+id/control_next"
android:src="@drawable/notification_next"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:layout_width="46dip"
android:layout_height="fill_parent"
android:layout_gravity="center|right"
diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml
index fe864ce3..aa9fe759 100644
--- a/res/layout/notification_expanded.xml
+++ b/res/layout/notification_expanded.xml
@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/notification_close"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:padding="10dip"
android:layout_gravity="right"
android:visibility="gone"/>
@@ -91,7 +91,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:padding="10dip"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:scaleType="fitCenter"
android:src="@drawable/notification_previous" />
@@ -102,7 +102,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:padding="10dip"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:scaleType="fitCenter"
android:src="@drawable/notification_pause" />
@@ -113,7 +113,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:padding="10dip"
- android:background="?android:selectableItemBackground"
+ style="@style/BasicButton"
android:scaleType="fitCenter"
android:src="@drawable/notification_next" />
</LinearLayout>
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index eb8346c3..4110d530 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -80,7 +80,7 @@
android:padding="10dip"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</RelativeLayout>
diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml
index 5b4a2895..fddc714f 100644
--- a/res/layout/song_list_item.xml
+++ b/res/layout/song_list_item.xml
@@ -102,5 +102,5 @@
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
android:paddingRight="10dip"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</LinearLayout>
diff --git a/res/layout/user_list_item.xml b/res/layout/user_list_item.xml
index d9b15cd0..c4092894 100644
--- a/res/layout/user_list_item.xml
+++ b/res/layout/user_list_item.xml
@@ -41,5 +41,5 @@
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
android:paddingRight="10dip"
- android:background="?android:selectableItemBackground"/>
+ style="@style/BasicButton"/>
</LinearLayout> \ No newline at end of file
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 00000000..04ab9a85
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="BasicButton">
+ <item name="android:background">?android:selectableItemBackground</item>
+ </style>
+</resources> \ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 103e4e49..1ce49e4a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="PlaybackControl">
- <item name="android:background">?android:selectableItemBackground</item>
+ <style name="BasicButton">
+ <item name="android:background">@drawable/abc_item_background_holo_light</item>
+ </style>
+
+ <style name="PlaybackControl" parent="@style/BasicButton">
<item name="android:scaleType">fitCenter</item>
<item name="android:padding">6dip</item>
<item name="android:layout_marginLeft">4dip</item>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 15:04:47 +0000