diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-21 13:59:38 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-24 18:44:22 +0100 |
| commit | 58c32f1f59173e8538e89db111c5be7fa69eb50e (patch) | |
| tree | 1305b322e87e9fa1b84a41437ce91e6fed58294a /android | |
| parent | b29ae2b97528e43dd9563645a178025cbfc50529 (diff) | |
Fix about dialog image, Fix null device name.
Change-Id: I487582592d468c83030202241d67296a0a1b6aa8
Diffstat (limited to 'android')
| -rw-r--r-- | android/sdremote/AndroidManifest.xml | 10 | ||||
| -rw-r--r-- | android/sdremote/res/drawable/libreoffice_logo.9.png | bin | 7083 -> 11667 bytes | |||
| -rw-r--r-- | android/sdremote/res/layout/dialog_about.xml | 1 | ||||
| -rw-r--r-- | android/sdremote/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java | 7 |
5 files changed, 14 insertions, 5 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 4a5811fccf67..bd38fab2bbb5 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 Binary files differindex 6f0294c5181b..1b239b777bf9 100644 --- a/android/sdremote/res/drawable/libreoffice_logo.9.png +++ b/android/sdremote/res/drawable/libreoffice_logo.9.png diff --git a/android/sdremote/res/layout/dialog_about.xml b/android/sdremote/res/layout/dialog_about.xml index d81b3a495406..6ec3c4e0e4ec 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 3a4a14184e86..be0d2c0dedf1 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 511f07f335b1..aa1cd9d01d9b 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; } /** |
