/source/si/editeng/

it://go.suokunlong.cn/lo/core' title='lo/core Git repository'/>
summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2012-07-25 14:28:59 +0200
committerMichael Meeks <michael.meeks@suse.com>2012-08-06 10:23:01 +0100
commit7c0ddee3f8d8e2d4f95e77fe67613c82dbd172bd (patch)
tree7c28c0f94ff9bf577401aed9ae5ec71bce2d478a /android
parent71a2d202a049d2ed383b1b363055aace0c21bc93 (diff)
First piece of ActionBar implemented.
Change-Id: I3b0a920da177ef4f11347fa50ddc3a44597b6824
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/AndroidManifest.xml11
-rw-r--r--android/sdremote/res/drawable/empty.pngbin0 -> 107 bytes
-rw-r--r--android/sdremote/res/drawable/icon_thumbs.pngbin0 -> 175 bytes
-rw-r--r--android/sdremote/res/layout/fragment_presentation.xml5
-rw-r--r--android/sdremote/res/layout/presentation_actionbar.xml22
-rw-r--r--android/sdremote/res/menu/actionbar_presentation.xml20
-rw-r--r--android/sdremote/res/values/strings.xml2
-rw-r--r--android/sdremote/res/values/styles.xml27
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java69
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java88
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java38
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/TestClient.java1
12 files changed, 162 insertions, 121 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 689e0ecfe9ee..4543b718569a 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -13,10 +13,12 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
+ android:logo="@drawable/empty"
android:theme="@style/Theme.ImpressRemote" >
<activity
android:name="TestClient"
- android:label="@string/app_name" >
+ android:label=""
+ >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -27,16 +29,9 @@
<service android:name=".communication.CommunicationService" >
</service>
- <activity android:name=".ThumbnailFragment" >
- </activity>
<activity
android:name=".PresentationActivity"
android:label="@string/title_activity_presentation" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
</activity>
</application>
diff --git a/android/sdremote/res/drawable/empty.png b/android/sdremote/res/drawable/empty.png
new file mode 100644
index 000000000000..8705a3df4191
--- /dev/null
+++ b/android/sdremote/res/drawable/empty.png
Binary files differ
diff --git a/android/sdremote/res/drawable/icon_thumbs.png b/android/sdremote/res/drawable/icon_thumbs.png
new file mode 100644
index 000000000000..ae10accd7ef6
--- /dev/null
+++ b/android/sdremote/res/drawable/icon_thumbs.png
Binary files differ
diff --git a/android/sdremote/res/layout/fragment_presentation.xml b/android/sdremote/res/layout/fragment_presentation.xml
index 2d17759a3c72..2b58bde0768c 100644
--- a/android/sdremote/res/layout/fragment_presentation.xml
+++ b/android/sdremote/res/layout/fragment_presentation.xml
@@ -15,6 +15,11 @@
coverflow:imageWidth="180dip"
coverflow:withReflection="false" />
+ <TextView
+ android:id="@+id/presentation_slidenumber"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
<ImageView
android:id="@+id/presentation_handle"
android:layout_width="fill_parent"
diff --git a/android/sdremote/res/layout/presentation_actionbar.xml b/android/sdremote/res/layout/presentation_actionbar.xml
new file mode 100644
index 000000000000..01f0d51d830d
--- /dev/null
+++ b/android/sdremote/res/layout/presentation_actionbar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+
+ <ImageButton
+ android:id="@+id/actionbar_thumbnailtoggle"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:background="@drawable/empty"
+ android:src="@drawable/icon_thumbs" />
+
+ <TextView
+ android:id="@+id/actionbar_time"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textSize="22dp"
+ android:textColor="#FFFFFF"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/android/sdremote/res/menu/actionbar_presentation.xml b/android/sdremote/res/menu/actionbar_presentation.xml
index 020fae1d49d5..03524efbac28 100644
--- a/android/sdremote/res/menu/actionbar_presentation.xml
+++ b/android/sdremote/res/menu/actionbar_presentation.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <item android:id="@+id/actionbar_presenation_thumbnail"></item>
- <item android:id="@+id/actionbar_presentation_timer">
- <menu>
- <item android:id="@+id/actionbar_presentation_timer_pause"/>
- </menu>
- </item>
- <item android:id="@+id/actionbar_presentation_submenu">
+
+ <item
+ android:id="@+id/actionbar_presentation_submenu"
+ android:showAsAction="always">
<menu>
- <item android:id="@+id/actionbar_presentation_submenu_blank" android:title="@string/presentation_blank_screen"/>
- <item android:id="@+id/actionbar_presentation_submenu_options" android:title="@string/options"/>
+ <item
+ android:id="@+id/actionbar_presentation_submenu_blank"
+ android:title="@string/presentation_blank_screen"/>
+ <item
+ android:id="@+id/actionbar_presentation_submenu_options"
+ android:title="@string/options"/>
</menu>
</item>
-
</menu> \ No newline at end of file
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index c677dcb5623f..7c9dae3e4441 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -7,6 +7,6 @@
<string name="presentation_ui_resizehandle">Handle to resize view.</string>
<string name="presentation_blank_screen">Blank Screen</string>
<string name="options">Options</string>
- <string name="actionbar_timeformat">HH:mm</string>
+ <string name="actionbar_timeformat">hh:mm</string>
<string name="actionbar_timerformat">h:m:ss</string>
</resources> \ No newline at end of file
diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml