Fix about dialog image, Fix null device name.

Change-Id: I487582592d468c83030202241d67296a0a1b6aa8

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"

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

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>

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;
     }
 
     /**