mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix about dialog image, Fix null device name.

Browse Source 
Change-Id: I487582592d468c83030202241d67296a0a1b6aa8
This commit is contained in:
Andrzej J.R. Hunt
2012-09-21 13:59:38 +02:00
parent b29ae2b975
commit 58c32f1f59
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/sdremote/AndroidManifest.xml
View File

@@ -36,10 +36,16 @@
android:noHistory="true" > android:noHistory="true" >
</activity> </activity>
<service android:name=".communication.CommunicationService" > <service
android:name=".communication.CommunicationService"
android:label="@string/startpresentation_title"
android:logo="@drawable/actionbar_icon_computer" >
</service> </service>
<activity android:name=".StartPresentationActivity" > <activity
android:name=".StartPresentationActivity"
android:logo="@drawable/actionbar_icon_computer"
android:label="@string/startpresentation_title" >
</activity> </activity>
<activity <activity
android:name=".PresentationActivity" android:name=".PresentationActivity"

BIN
android/sdremote/res/drawable/libreoffice_logo.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

1
android/sdremote/res/layout/dialog_about.xml
View File

@@ -10,6 +10,7 @@
android:id="@+id/imageView1" android:id="@+id/imageView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/libreoffice_logo" /> android:src="@drawable/libreoffice_logo" />
<ScrollView <ScrollView

1
android/sdremote/res/values/strings.xml
View File

@@ -33,6 +33,7 @@
<string name="pairing_instructions_3">Then input this PIN:</string> <string name="pairing_instructions_3">Then input this PIN:</string>
<string name="startpresentation_instruction">No presentation is currently running.</string> <string name="startpresentation_instruction">No presentation is currently running.</string>
<string name="startpresentation_button">Start Presentation</string> <string name="startpresentation_button">Start Presentation</string>
<string name="startpresentation_title">Start Presentation</string>
<string name="about">About</string> <string name="about">About</string>
<string name="about_close">Close</string> <string name="about_close">Close</string>
<string name="about_versionstring">Version: {0} (Build ID: {1})</string> <string name="about_versionstring">Version: {0} (Build ID: {1})</string>

7
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
View File

@@ -40,10 +40,11 @@ public class CommunicationService extends Service implements Runnable {
public static String getDeviceName() { public static String getDeviceName() {
BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
if (aAdapter != null) { if (aAdapter != null) {
return aAdapter.getName(); String aName = aAdapter.getName();
} else { if (aName != null)
return android.os.Build.MODEL; return aName;
} }
return android.os.Build.MODEL;
} }
/** /**