android/sdremote/AndroidManifest.xml
| 11
android/sdremote/res/drawable/libreoffice_logo.9.png
|binary
android/sdremote/res/layout/dialog_about.xml
| 113 +++++-----
android/sdremote/res/values/strings.xml
| 1
android/sdremote/res/xml/preferences.xml
| 6
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 7
dev/null
|binary
7 files changed, 79 insertions(+), 59 deletions(-)
New commits:
commit 58c32f1f59173e8538e89db111c5be7fa69eb50e
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Fri Sep 21 13:59:38 2012 +0200
Fix about dialog image, Fix null device name.
Change-Id: I487582592d468c83030202241d67296a0a1b6aa8
diff --git a/android/sdremote/AndroidManifest.xml
b/android/sdremote/AndroidManifest.xml
index 4a5811f..bd38fab 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -36,10 +36,16 @@
android:noHistory="true" >
</activity>
- <service android:name=".communication.CommunicationService" >
+ <service
+ android:name=".communication.CommunicationService"
+ android:label="@string/startpresentation_title"
+ android:logo="@drawable/actionbar_icon_computer" >
</service>
- <activity android:name=".StartPresentationActivity" >
+ <activity
+ android:name=".StartPresentationActivity"
+ android:logo="@drawable/actionbar_icon_computer"
+ android:label="@string/startpresentation_title" >
</activity>
<activity
android:name=".PresentationActivity"
diff --git a/android/sdremote/res/drawable/libreoffice_logo.9.png
b/android/sdremote/res/drawable/libreoffice_logo.9.png
index 6f0294c..1b239b7 100644
Binary files a/android/sdremote/res/drawable/libreoffice_logo.9.png and
b/android/sdremote/res/drawable/libreoffice_logo.9.png differ
diff --git a/android/sdremote/res/layout/dialog_about.xml
b/android/sdremote/res/layout/dialog_about.xml
index d81b3a4..6ec3c4e 100644
--- a/android/sdremote/res/layout/dialog_about.xml
+++ b/android/sdremote/res/layout/dialog_about.xml
@@ -10,6 +10,7 @@
android:id="@+id/imageView1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:scaleType="fitXY"
android:src="@drawable/libreoffice_logo" />
<ScrollView
diff --git a/android/sdremote/res/values/strings.xml
b/android/sdremote/res/values/strings.xml
index 3a4a141..be0d2c0 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -33,6 +33,7 @@
<string name="pairing_instructions_3">Then input this PIN:</string>
<string name="startpresentation_instruction">No presentation is currently
running.</string>
<string name="startpresentation_button">Start Presentation</string>
+ <string name="startpresentation_title">Start Presentation</string>
<string name="about">About</string>
<string name="about_close">Close</string>
<string name="about_versionstring">Version: {0} (Build ID: {1})</string>
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 511f07f..aa1cd9d 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -40,10 +40,11 @@ public class CommunicationService extends Service
implements Runnable {
public static String getDeviceName() {
BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
if (aAdapter != null) {
- return aAdapter.getName();
- } else {
- return android.os.Build.MODEL;
+ String aName = aAdapter.getName();
+ if (aName != null)
+ return aName;
}
+ return android.os.Build.MODEL;
}
/**
commit b29ae2b97528e43dd9563645a178025cbfc50529
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Fri Sep 21 12:31:40 2012 +0200
Improve About Dialog for small or very large screens.
Change-Id: Iec8b67dd4e59ca8a1c17119cae5be91fceecf1b1
diff --git a/android/sdremote/res/drawable/libreoffice_logo.9.png
b/android/sdremote/res/drawable/libreoffice_logo.9.png
new file mode 100644
index 0000000..6f0294c
Binary files /dev/null and
b/android/sdremote/res/drawable/libreoffice_logo.9.png differ
diff --git a/android/sdremote/res/drawable/libreoffice_logo.png
b/android/sdremote/res/drawable/libreoffice_logo.png
deleted file mode 100644
index f4f826b..0000000
Binary files a/android/sdremote/res/drawable/libreoffice_logo.png and /dev/null
differ
diff --git a/android/sdremote/res/layout/dialog_about.xml
b/android/sdremote/res/layout/dialog_about.xml
index ce30a25..d81b3a4 100644
--- a/android/sdremote/res/layout/dialog_about.xml
+++ b/android/sdremote/res/layout/dialog_about.xml
@@ -8,65 +8,75 @@
<ImageView
android:id="@+id/imageView1"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/libreoffice_logo" />
- <TextView
- android:id="@+id/about_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/app_name"
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
- <TextView
- android:id="@+id/about_version"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/about_versionstring" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
- <TextView
- android:id="@+id/about_copyright"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/about_copyright" />
+ <TextView
+ android:id="@+id/about_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="10dip"
+ android:gravity="center_horizontal"
+ android:text="@string/app_name"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
- <TextView
- android:id="@+id/about_link"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:autoLink="web"
- android:linksClickable="true"
- android:text="www.libreoffice.org"
- tools:ignore="HardcodedText" />
+ <TextView
+ android:id="@+id/about_version"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="10dip"
+ android:gravity="center_horizontal"
+ android:text="@string/about_versionstring" />
- <TextView
- android:id="@+id/about_licence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
- android:gravity="center_horizontal"
- android:text="@string/about_licence" />
+ <TextView
+ android:id="@+id/about_copyright"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="10dip"
+ android:gravity="center_horizontal"
+ android:text="@string/about_copyright" />
- <TextView
- android:id="@+id/about_libraries"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="10dip"
+ <TextView
+ android:id="@+id/about_link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="10dip"
+ android:autoLink="web"
+ android:linksClickable="true"
+ android:text="www.libreoffice.org"
+ tools:ignore="HardcodedText" />
+
+ <TextView
+ android:id="@+id/about_licence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="10dip"
+ android:gravity="center_horizontal"
+ android:text="@string/about_licence" />
- android:text="@string/about_libraries" />
+ <TextView
+ android:id="@+id/about_libraries"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="10dip"
+ android:text="@string/about_libraries" />
+ </LinearLayout>
+ </ScrollView>
</LinearLayout>
\ No newline at end of file
commit c31e0a0b189505e2f9d5319a033f3cd237720dd6
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Fri Sep 21 12:16:50 2012 +0200
Change a SwitchPreference to CheckBoxPreference for Android 2 compatibility.
(SwitchPreference requires android api >= 14, i.e. Android 4.)
Change-Id: I69d83946407d008b8e47b320b5a4f5120c0ff35d
diff --git a/android/sdremote/AndroidManifest.xml
b/android/sdremote/AndroidManifest.xml
index 80a2541..4a5811f 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -32,6 +32,7 @@
<activity
android:name=".PairingActivity"
android:icon="@drawable/actionbar_icon_computer"
+ android:logo="@drawable/actionbar_icon_computer"
android:noHistory="true" >
</activity>
diff --git a/android/sdremote/res/xml/preferences.xml
b/android/sdremote/res/xml/preferences.xml
index 5d7e68b..0a10063 100644
--- a/android/sdremote/res/xml/preferences.xml
+++ b/android/sdremote/res/xml/preferences.xml
@@ -2,11 +2,11 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"; >
<!-- <SwitchPreference android:defaultValue="false"
android:title="@string/options_autodecline" android:key="option_autodecline"/>
-->
- <SwitchPreference
+ <CheckBoxPreference
android:defaultValue="false"
android:key="option_volumeswitching"
- android:title="@string/options_volumeswitching"
- android:summary="@string/options_volumeswitching_descripton"/>
+ android:summary="@string/options_volumeswitching_descripton"
+ android:title="@string/options_volumeswitching" />
<Preference
android:key="option_switchcomputer"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
