[Libreoffice-commits] core.git: 5 commits - android/sdremote
Artur Dryomov
artur.dryomov at gmail.com
Sun Sep 29 14:43:02 PDT 2013
android/sdremote/res/drawable-hdpi/bg_action_bar.9.png |binary
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.png |binary
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.png |binary
android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.png |binary
android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.png |binary
android/sdremote/res/drawable-nodpi/bg_slide_unknown.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar.9.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.png |binary
android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_cancel.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_grid.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_pager.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_reconnect.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_resume.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_save.png |binary
android/sdremote/res/drawable-xxhdpi/ic_action_timer.png |binary
android/sdremote/res/drawable/action_bar_tab.xml | 26 ----
android/sdremote/res/drawable/background_grid_slide.xml | 17 --
android/sdremote/res/drawable/bg_action_bar_tab.xml | 61 ++++++++++
android/sdremote/res/drawable/bg_grid_slide.xml | 17 ++
android/sdremote/res/drawable/underline_header.xml | 2
android/sdremote/res/layout/fragment_computers_list.xml | 5
android/sdremote/res/layout/view_grid_slide.xml | 2
android/sdremote/res/menu/menu_action_bar_computers.xml | 2
android/sdremote/res/values/colors.xml | 1
android/sdremote/res/values/dimens.xml | 1
android/sdremote/res/values/strings.xml | 4
android/sdremote/res/values/themes.xml | 8 -
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java | 4
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java | 4
dev/null |binary
44 files changed, 97 insertions(+), 57 deletions(-)
New commits:
commit 6faff72236906a9e2326374d8db016edc8048a3c
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Mon Sep 30 00:17:13 2013 +0300
Add xxhdpi action bar icons and remove an unused search icon.
Change-Id: I7c092f0c5e42ea478946506be49a2ad47a4bb67a
diff --git a/android/sdremote/res/drawable-hdpi/ic_action_search.png b/android/sdremote/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index 67de12d..0000000
Binary files a/android/sdremote/res/drawable-hdpi/ic_action_search.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-mdpi/ic_action_search.png b/android/sdremote/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index 134d549..0000000
Binary files a/android/sdremote/res/drawable-mdpi/ic_action_search.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-xhdpi/ic_action_search.png b/android/sdremote/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index d699c6b..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/ic_action_search.png and /dev/null differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_cancel.png b/android/sdremote/res/drawable-xxhdpi/ic_action_cancel.png
new file mode 100644
index 0000000..5dc2143
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_cancel.png differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_grid.png b/android/sdremote/res/drawable-xxhdpi/ic_action_grid.png
new file mode 100644
index 0000000..bba7a0a
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_grid.png differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_pager.png b/android/sdremote/res/drawable-xxhdpi/ic_action_pager.png
new file mode 100644
index 0000000..810e377
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_pager.png differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_reconnect.png b/android/sdremote/res/drawable-xxhdpi/ic_action_reconnect.png
new file mode 100644
index 0000000..f5ed228
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_reconnect.png differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_resume.png b/android/sdremote/res/drawable-xxhdpi/ic_action_resume.png
new file mode 100644
index 0000000..7f7ca2e
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_resume.png differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_save.png b/android/sdremote/res/drawable-xxhdpi/ic_action_save.png
new file mode 100644
index 0000000..68c41de
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_save.png differ
diff --git a/android/sdremote/res/drawable-xxhdpi/ic_action_timer.png b/android/sdremote/res/drawable-xxhdpi/ic_action_timer.png
new file mode 100644
index 0000000..a06752c
Binary files /dev/null and b/android/sdremote/res/drawable-xxhdpi/ic_action_timer.png differ
commit 3b0c8081de5168b2df12f8cd9a146905680d14ab
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Sun Sep 29 23:45:13 2013 +0300
Add some horizontal space for the computers list.
Change-Id: I4dffdf3477e4c98420ef3dee9990485c70d7a1ec
diff --git a/android/sdremote/res/layout/fragment_computers_list.xml b/android/sdremote/res/layout/fragment_computers_list.xml
index 46cb106..4f34433 100644
--- a/android/sdremote/res/layout/fragment_computers_list.xml
+++ b/android/sdremote/res/layout/fragment_computers_list.xml
@@ -35,7 +35,10 @@
<ListView
android:id="@android:id/list"
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingLeft="@dimen/padding_horizontal_list"
+ android:paddingRight="@dimen/padding_horizontal_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
-</ViewAnimator>
\ No newline at end of file
+</ViewAnimator>
diff --git a/android/sdremote/res/values/dimens.xml b/android/sdremote/res/values/dimens.xml
index 7da8e69..259ab3a 100644
--- a/android/sdremote/res/values/dimens.xml
+++ b/android/sdremote/res/values/dimens.xml
@@ -16,6 +16,7 @@
<dimen name="padding_section_item">8dp</dimen>
<dimen name="padding_empty_slide_layout">16dp</dimen>
+ <dimen name="padding_horizontal_list">16dp</dimen>
<dimen name="padding_horizontal_list_item">8dp</dimen>
<dimen name="padding_horizontal_connection_layout">40dp</dimen>
<dimen name="padding_horizontal_action_bar_button">20dp</dimen>
commit 3b631e4142090fa90631d68b1c388b1fd94ab10c
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Fri Sep 27 01:52:21 2013 +0300
Rename some resources, fix action bar tab selectors as well.
Change-Id: I48b4f69bd85b9aa0b034f6a7210311598662c163
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 54eb3ef..0000000
Binary files a/android/sdremote/res/drawable-hdpi/action_bar_tab_selected.9.png and /dev/null 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 5ceac2d..0000000
Binary files a/android/sdremote/res/drawable-hdpi/action_bar_tab_selected_pressed.9.png and /dev/null 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 d2b0076..0000000
Binary files a/android/sdremote/res/drawable-hdpi/action_bar_tab_unselected.9.png and /dev/null 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
similarity index 100%
rename from android/sdremote/res/drawable-hdpi/action_bar_background.9.png
rename to android/sdremote/res/drawable-hdpi/bg_action_bar.9.png
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 0000000..dff6238
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected.9.png 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 0000000..0602056
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_focused.9.png 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 0000000..933ff55
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_selected_pressed.9.png 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 0000000..93dc5dc
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected.9.png 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 0000000..57c5f18
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_focused.9.png 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 0000000..f44171c
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/bg_action_bar_tab_unselected_pressed.9.png 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 c572c34..0000000
Binary files a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected.9.png and /dev/null 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 20d9d69..0000000
Binary files a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_selected_pressed.9.png and /dev/null 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 b3e51d8..0000000
Binary files a/android/sdremote/res/drawable-land-hdpi/action_bar_tab_unselected.9.png and /dev/null 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 b9b5da3..0000000
Binary files a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected.9.png and /dev/null 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 9a63265..0000000
Binary files a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_selected_pressed.9.png and /dev/null 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 06fbcbb..0000000
Binary files a/android/sdremote/res/drawable-land-mdpi/action_bar_tab_unselected.9.png and /dev/null 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 f3aac1a..0000000
Binary files a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected.9.png and /dev/null 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 f2331fa..0000000
Binary files a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_selected_pressed.9.png and /dev/null 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 06741ee..0000000
Binary files a/android/sdremote/res/drawable-land-xhdpi/action_bar_tab_unselected.9.png and /dev/null 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 612258e..0000000
Binary files a/android/sdremote/res/drawable-mdpi/action_bar_tab_selected.9.png and /dev/null 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 524ee6b..0000000
Binary files a/android/sdremote/res/drawable-mdpi/action_bar_tab_selected_pressed.9.png and /dev/null 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 f433580..0000000
Binary files a/android/sdremote/res/drawable-mdpi/action_bar_tab_unselected.9.png and /dev/null 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
similarity index 100%
rename from android/sdremote/res/drawable-mdpi/action_bar_background.9.png
rename to android/sdremote/res/drawable-mdpi/bg_action_bar.9.png
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 0000000..c04af6c
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected.9.png 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 0000000..60a3e8c
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_focused.9.png 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 0000000..64dda62
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_selected_pressed.9.png 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 0000000..1a998b0
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected.9.png 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 0000000..0fa12db
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_focused.9.png 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 0000000..2c13a55
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/bg_action_bar_tab_unselected_pressed.9.png differ
diff --git a/android/sdremote/res/drawable-nodpi/slide_unknown.png b/android/sdremote/res/drawable-nodpi/bg_slide_unknown.png
similarity index 100%
rename from android/sdremote/res/drawable-nodpi/slide_unknown.png
rename to android/sdremote/res/drawable-nodpi/bg_slide_unknown.png
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 3a10d7d..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected.9.png and /dev/null 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 e38ad0f..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/action_bar_tab_selected_pressed.9.png and /dev/null 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 505f7ea..0000000
Binary files a/android/sdremote/res/drawable-xhdpi/action_bar_tab_unselected.9.png and /dev/null 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
similarity index 100%
rename from android/sdremote/res/drawable-xhdpi/action_bar_background.9.png
rename to android/sdremote/res/drawable-xhdpi/bg_action_bar.9.png
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 0000000..d2d06a4
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected.9.png 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 0000000..286e973
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_focused.9.png 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 0000000..c97c301
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_selected_pressed.9.png 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 0000000..08e5ed1
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected.9.png 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 0000000..3c87dd9
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_focused.9.png 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 0000000..fd190db
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/bg_action_bar_tab_unselected_pressed.9.png 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 45b26dd..0000000
--- 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 0000000..4293fcf
--- /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
similarity index 100%
rename from android/sdremote/res/drawable/background_grid_slide.xml
rename to 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 cee5b99..9613dbf 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 4c3d573..8b5177c 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 f78bed9..6d1dfbd 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 049c9b5..43877b0 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 f066cc8..400b675 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 846226f..7524dc4 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 328dc97..94304fb 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
commit 041452c69f7764e3075084cf74dac06f748a04e8
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Thu Sep 26 23:24:28 2013 +0300
Change text for keeping screen on preference.
Change-Id: I565889ff328816031f5a73d9817b53bd18e7f153
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index 0eefa95..cf84a3a 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -62,8 +62,8 @@
<string name="preferences_volume_keys_actions_title">Volume keys actions</string>
<string name="preferences_volume_keys_actions_summary">Switch slides and activate animations using volume keys</string>
- <string name="preferences_keep_screen_on_title">Screen on</string>
- <string name="preferences_keep_screen_on_summary">Keep screen on while presenting</string>
+ <string name="preferences_keep_screen_on_title">Keep screen on</string>
+ <string name="preferences_keep_screen_on_summary">Prevent phone from sleeping while presenting</string>
<string name="requirements_libreoffice_version">LibreOffice version 4.0.3 or higher running on a computer.</string>
<string name="requirements_libreoffice_general_enabled">Impress Remote enabled at “Tools → Options → LibreOffice Impress → General†in LibreOffice Impress.</string>
commit 2d40728421833a8f1ccca4b55872c1de252c936d
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date: Thu Sep 26 23:05:06 2013 +0300
Change action bar background.
Use 9-patch instead of solid color. The drawable contains a little
bottom border which suits action bar better, especially on Jelly Bean
MR3 where there are no shadow below the action bar.
Change-Id: I2fd34109aae82b52326cf1315c4080e72bdb2530
diff --git a/android/sdremote/res/drawable-hdpi/action_bar_background.9.png b/android/sdremote/res/drawable-hdpi/action_bar_background.9.png
new file mode 100755
index 0000000..18d2ea9
Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/action_bar_background.9.png differ
diff --git a/android/sdremote/res/drawable-mdpi/action_bar_background.9.png b/android/sdremote/res/drawable-mdpi/action_bar_background.9.png
new file mode 100755
index 0000000..1a65764
Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/action_bar_background.9.png differ
diff --git a/android/sdremote/res/drawable-xhdpi/action_bar_background.9.png b/android/sdremote/res/drawable-xhdpi/action_bar_background.9.png
new file mode 100755
index 0000000..9c08f12
Binary files /dev/null and b/android/sdremote/res/drawable-xhdpi/action_bar_background.9.png differ
diff --git a/android/sdremote/res/values/themes.xml b/android/sdremote/res/values/themes.xml
index bdf73a3..f066cc8 100644
--- a/android/sdremote/res/values/themes.xml
+++ b/android/sdremote/res/values/themes.xml
@@ -10,8 +10,8 @@
</style>
<style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@color/background_action_bar</item>
- <item name="background">@color/background_action_bar</item>
+ <item name="android:background">@drawable/action_bar_background</item>
+ <item name="background">@drawable/action_bar_background</item>
<item name="android:displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
<item name="displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
More information about the Libreoffice-commits
mailing list