summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorArtur Dryomov <artur.dryomov@gmail.com>2013-09-27 01:52:21 +0300
committerArtur Dryomov <artur.dryomov@gmail.com>2013-09-30 00:39:24 +0300
commit3b631e4142090fa90631d68b1c388b1fd94ab10c (patch)
tree71fb376451e32d3ff8dee1b33ccad741511977c1 /android
parent041452c69f7764e3075084cf74dac06f748a04e8 (diff)
Rename some resources, fix action bar tab selectors as well.
Change-Id: I48b4f69bd85b9aa0b034f6a7210311598662c163
Diffstat (limited to 'android')
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.pngbin101 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.pngbin107 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.pngbin103 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar.9.png (renamed from android/sdremote/res/drawable-hdpi/action_bar_background.9.png)bin209 -> 209 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.pngbin0 -> 101 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.pngbin0 -> 107 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.pngbin0 -> 106 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.pngbin0 -> 103 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.pngbin0 -> 100 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.pngbin0 -> 100 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.pngbin101 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.pngbin107 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.pngbin103 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.pngbin97 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.pngbin104 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.pngbin107 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.pngbin105 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.pngbin111 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.pngbin112 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.pngbin97 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.pngbin104 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.pngbin107 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar.9.png (renamed from android/sdremote/res/drawable-mdpi/action_bar_background.9.png)bin166 -> 166 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.pngbin0 -> 97 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.pngbin0 -> 104 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.pngbin0 -> 104 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.pngbin0 -> 107 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.pngbin0 -> 98 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.pngbin0 -> 97 bytes
-rw-r--r--android/sdremote/res/drawable-nodpi/bg_slide_unknown.png (renamed from android/sdremote/res/drawable-nodpi/slide_unknown.png)bin3543 -> 3543 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.pngbin105 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.pngbin111 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.pngbin116 -> 0 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar.9.png (renamed from android/sdremote/res/drawable-xhdpi/action_bar_background.9.png)bin272 -> 272 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.pngbin0 -> 105 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.pngbin0 -> 111 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.pngbin0 -> 111 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.pngbin0 -> 116 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.pngbin0 -> 101 bytes
-rwxr-xr-xandroid/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.pngbin0 -> 101 bytes
-rw-r--r--android/sdremote/res/drawable/action_bar_tab.xml26
-rw-r--r--android/sdremote/res/drawable/bg_action_bar_tab.xml61
-rw-r--r--android/sdremote/res/drawable/bg_grid_slide.xml (renamed from android/sdremote/res/drawable/background_grid_slide.xml)0
-rw-r--r--android/sdremote/res/drawable/underline_header.xml2
-rw-r--r--android/sdremote/res/layout/view_grid_slide.xml2
-rw-r--r--android/sdremote/res/menu/menu_action_bar_computers.xml2
-rw-r--r--android/sdremote/res/values/colors.xml1
-rw-r--r--android/sdremote/res/values/themes.xml8
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java4
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java4
50 files changed, 73 insertions, 37 deletions
diff --git a/android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png b/android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png
deleted file mode 100755
index 54eb3efb224c..000000000000
--- a/android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png
deleted file mode 100755
index 5ceac2d4821b..000000000000
--- a/android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png
deleted file mode 100755
index d2b0076c83b1..000000000000
--- a/android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/action_bar_background.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar.9.png
index 18d2ea9910e1..18d2ea9910e1 100755
--- a/android/sdremote/res/drawable-hdpi/action_bar_background.9.png
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.png
new file mode 100755
index 000000000000..dff623860a4c
--- /dev/null
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.png
new file mode 100755
index 000000000000..060205674383
--- /dev/null
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.png
new file mode 100755
index 000000000000..933ff55f0e0d
--- /dev/null
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.png
new file mode 100755
index 000000000000..93dc5dc91275
--- /dev/null
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.png
new file mode 100755
index 000000000000..57c5f1821143
--- /dev/null
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.png b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.png
new file mode 100755
index 000000000000..f44171cceea2
--- /dev/null
+++ b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png b/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png
deleted file mode 100755
index c572c3406702..000000000000
--- a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png
deleted file mode 100755
index 20d9d691045f..000000000000
--- a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png
deleted file mode 100755
index b3e51d81df67..000000000000
--- a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png b/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png
deleted file mode 100755
index b9b5da388952..000000000000
--- a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png
deleted file mode 100755
index 9a63265f5e3f..000000000000
--- a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png
deleted file mode 100755
index 06fbcbbd8537..000000000000
--- a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png b/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png
deleted file mode 100755
index f3aac1a0ed8c..000000000000
--- a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png
deleted file mode 100755
index f2331fa543f8..000000000000
--- a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png
deleted file mode 100755
index 06741ee2c630..000000000000
--- a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png b/android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png
deleted file mode 100755
index 612258e42018..000000000000
--- a/android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png
deleted file mode 100755
index 524ee6bc4097..000000000000
--- a/android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png
deleted file mode 100755
index f4335809fca6..000000000000
--- a/android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/action_bar_background.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar.9.png
index 1a6576437d2e..1a6576437d2e 100755
--- a/android/sdremote/res/drawable-mdpi/action_bar_background.9.png
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.png
new file mode 100755
index 000000000000..c04af6c8d21c
--- /dev/null
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.png
new file mode 100755
index 000000000000..60a3e8cc42b2
--- /dev/null
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.png
new file mode 100755
index 000000000000..64dda62d5955
--- /dev/null
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.png
new file mode 100755
index 000000000000..1a998b047dc5
--- /dev/null
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.png
new file mode 100755
index 000000000000..0fa12dbfe024
--- /dev/null
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.png b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.png
new file mode 100755
index 000000000000..2c13a555047e
--- /dev/null
+++ b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-nodpi/slide_unknown.png b/android/sdremote/res/drawable-nodpi/bg_slide_unknown.png
index 62d55e7dd5f1..62d55e7dd5f1 100644
--- a/android/sdremote/res/drawable-nodpi/slide_unknown.png
+++ b/android/sdremote/res/drawable-nodpi/bg_slide_unknown.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png
deleted file mode 100755
index 3a10d7d10010..000000000000
--- a/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png
deleted file mode 100755
index e38ad0f1d911..000000000000
--- a/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png
deleted file mode 100755
index 505f7eaba1a2..000000000000
--- a/android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/action_bar_background.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar.9.png
index 9c08f1224081..9c08f1224081 100755
--- a/android/sdremote/res/drawable-xhdpi/action_bar_background.9.png
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.png
new file mode 100755
index 000000000000..d2d06a40c940
--- /dev/null
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.png
new file mode 100755
index 000000000000..286e9738d9cb
--- /dev/null
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.png
new file mode 100755
index 000000000000..c97c3011c735
--- /dev/null
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.png
new file mode 100755
index 000000000000..08e5ed1e35fd
--- /dev/null
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.png
new file mode 100755
index 000000000000..3c87dd9c016e
--- /dev/null
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.png b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.png
new file mode 100755
index 000000000000..fd190dbe2117
--- /dev/null
+++ b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.png
Binary files differ
diff --git a/android/sdremote/res/drawable/action_bar_tab.xml b/android/sdremote/res/drawable/action_bar_tab.xml
deleted file mode 100644
index 45b26dd131f3..000000000000
--- a/android/sdremote/res/drawable/action_bar_tab.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item
- android:state_focused="false"
- android:state_selected="false"
- android:state_pressed="false"
- android:drawable="@drawable/action_bar_tab_unselected"/>
-
- <item
- android:state_focused="false"
- android:state_selected="true"
- android:state_pressed="false"
- android:drawable="@drawable/action_bar_tab_selected"/>
-
- <item
- android:state_selected="false"
- android:state_pressed="true"
- android:drawable="@drawable/action_bar_tab_selected_pressed"/>
-
- <item
- android:state_selected="true"
- android:state_pressed="true"
- android:drawable="@drawable/action_bar_tab_selected_pressed"/>
-
-</selector> \ No newline at end of file
diff --git a/android/sdremote/res/drawable/bg_action_bar_tab.xml b/android/sdremote/res/drawable/bg_action_bar_tab.xml
new file mode 100644
index 000000000000..4293fcf18cc2
--- /dev/null
+++ b/android/sdremote/res/drawable/bg_action_bar_tab.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Non focused states -->
+
+ <item
+ android:state_focused="false"
+ android:state_selected="false"
+ android:state_pressed="false"
+ android:drawable="@android:color/transparent"/>
+
+ <item
+ android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/bg_action_bar_tab_selected"/>
+
+ <!-- Focused states -->
+
+ <item
+ android:state_focused="true"
+ android:state_selected="false"
+ android:state_pressed="false"
+ android:drawable="@drawable/bg_action_bar_tab_unselected_focused"/>
+
+ <item
+ android:state_focused="true"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/bg_action_bar_tab_selected_focused"/>
+
+ <!-- Pressed -->
+
+ <!-- Non focused states -->
+ <item
+ android:state_focused="false"
+ android:state_selected="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/bg_action_bar_tab_unselected_pressed"/>
+
+ <item
+ android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/bg_action_bar_tab_selected_pressed"/>
+
+ <!-- Focused states -->
+
+ <item
+ android:state_focused="true"
+ android:state_selected="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/bg_action_bar_tab_unselected_pressed"/>
+
+ <item
+ android:state_focused="true"
+ android:state_selected="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/bg_action_bar_tab_selected_pressed"/>
+
+</selector> \ No newline at end of file
diff --git a/android/sdremote/res/drawable/background_grid_slide.xml b/android/sdremote/res/drawable/bg_grid_slide.xml
index e7fca36b68b6..e7fca36b68b6 100644
--- a/android/sdremote/res/drawable/background_grid_slide.xml
+++ b/android/sdremote/res/drawable/bg_grid_slide.xml
diff --git a/android/sdremote/res/drawable/underline_header.xml b/android/sdremote/res/drawable/underline_header.xml
index cee5b99459c6..9613dbf82839 100644
--- a/android/sdremote/res/drawable/underline_header.xml
+++ b/android/sdremote/res/drawable/underline_header.xml
@@ -3,7 +3,7 @@
android:shape="rectangle">
<size
- android:width="10000dp"
+ android:width="100000dp"
android:height="1dp"/>
<solid
diff --git a/android/sdremote/res/layout/view_grid_slide.xml b/android/sdremote/res/layout/view_grid_slide.xml
index 4c3d5730f8d1..8b5177c6350c 100644
--- a/android/sdremote/res/layout/view_grid_slide.xml
+++ b/android/sdremote/res/layout/view_grid_slide.xml
@@ -7,7 +7,7 @@
<ImageView
android:id="@+id/image_slide_preview"
android:adjustViewBounds="true"
- android:background="@drawable/background_grid_slide"
+ android:background="@drawable/bg_grid_slide"
android:contentDescription="@string/description_grid_slide"
android:layout_alignParentTop="true"
android:layout_width="wrap_content"
diff --git a/android/sdremote/res/menu/menu_action_bar_computers.xml b/android/sdremote/res/menu/menu_action_bar_computers.xml
index f78bed916681..6d1dfbdeac1a 100644
--- a/android/sdremote/res/menu/menu_action_bar_computers.xml
+++ b/android/sdremote/res/menu/menu_action_bar_computers.xml
@@ -9,7 +9,7 @@
<item
android:id="@+id/menu_settings"
- android:title="@string/title_settings"
+ android:title="@string/menu_settings"
android:showAsAction="never"/>
<item
diff --git a/android/sdremote/res/values/colors.xml b/android/sdremote/res/values/colors.xml
index 049c9b593d39..43877b08c708 100644
--- a/android/sdremote/res/values/colors.xml
+++ b/android/sdremote/res/values/colors.xml
@@ -2,6 +2,7 @@
<resources>
<color name="background_action_bar">#e46f1f</color>
+ <color name="background_action_bar_tab_indicator">#e6821c</color>
<color name="background_action_bar_divider">#55ffffff</color>
<color name="background_header">@color/background_action_bar</color>
<color name="background_slide_index">#7f000000</color>
diff --git a/android/sdremote/res/values/themes.xml b/android/sdremote/res/values/themes.xml
index f066cc84be71..400b675788a7 100644
--- a/android/sdremote/res/values/themes.xml
+++ b/android/sdremote/res/values/themes.xml
@@ -10,16 +10,16 @@
</style>
<style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@drawable/action_bar_background</item>
- <item name="background">@drawable/action_bar_background</item>
+ <item name="android:background">@drawable/bg_action_bar</item>
+ <item name="background">@drawable/bg_action_bar</item>
<item name="android:displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
<item name="displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
</style>
<style name="Theme.ImpressRemote.ActionBar.Tab" parent="Widget.Sherlock.Light.ActionBar.TabView.Inverse">
- <item name="android:background">@drawable/action_bar_tab</item>
- <item name="background">@drawable/action_bar_tab</item>
+ <item name="android:background">@drawable/bg_action_bar_tab</item>
+ <item name="background">@drawable/bg_action_bar_tab</item>
</style>
<style name="Theme.ImpressRemote.Computers" parent="Theme.ImpressRemote">
diff --git a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
index 846226fa50e0..7524dc4fef5f 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
@@ -28,7 +28,7 @@ public class SlidesGridAdapter extends BaseAdapter {
public SlidesGridAdapter(Context aContext, SlideShow aSlideShow) {
mLayoutInflater = LayoutInflater.from(aContext);
- mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.slide_unknown);
+ mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.bg_slide_unknown);
mSlideShow = aSlideShow;
}
@@ -105,7 +105,7 @@ public class SlidesGridAdapter extends BaseAdapter {
}
private void setUpUnknownSlidePreview(ViewHolder aSlideViewHolder) {
- aSlideViewHolder.mSlidePreview.setImageResource(R.drawable.slide_unknown);
+ aSlideViewHolder.mSlidePreview.setImageResource(R.drawable.bg_slide_unknown);
}
private String buildSlideIndex(int aPosition) {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
index 328dc9773a39..94304fbfe784 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
@@ -29,7 +29,7 @@ public class SlidesPagerAdapter extends PagerAdapter {
public SlidesPagerAdapter(Context aContext, SlideShow aSlideShow, View.OnClickListener aSlideClickListener) {
mLayoutInflater = LayoutInflater.from(aContext);
- mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.slide_unknown);
+ mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.bg_slide_unknown);
mSlideShow = aSlideShow;
@@ -76,7 +76,7 @@ public class SlidesPagerAdapter extends PagerAdapter {
}
private void setUpUnknownSlidePreview(ImageView aSlideView) {
- aSlideView.setImageResource(R.drawable.slide_unknown);
+ aSlideView.setImageResource(R.drawable.bg_slide_unknown);
}
@Override