Merge "Fixing Subscription list item and Message list item layouts for Android Jelly bean" into develop

Author: Ian Craggs

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.eclipse.paho.android.sample" >
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.eclipse.paho.android.sample">
 
 
     <!-- Permissions the Application Requires -->
@@ -17,7 +18,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/MaterialTheme" >
+        android:theme="@style/MaterialTheme"
+        tools:replace="android:theme">
 
         <!-- Mqtt Service -->
         <service android:name="org.eclipse.paho.android.service.MqttService" >
@@ -34,13 +36,6 @@
             </intent-filter>
 
         </activity>
-        <activity
-            android:name=".activity.EditConnectionActivity"
-            android:label="@string/action_add_connection" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.eclipse.paho.android.sample.activity.MainActivity"/>
-        </activity>
     </application>
 
 </manifest>

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/components/MessageListItemAdapter.java

@@ -41,7 +41,7 @@ public View getView(final int position, View convertView, ViewGroup parent){
         topicTextView.setText(new String("Topic: " + messages.get(position).getTopic()));
         SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
         String shortDateStamp = format.format(messages.get(position).getTimestamp());
-        dateTextView.setText("Date: " + shortDateStamp);
+        dateTextView.setText("Time: " + shortDateStamp);
         return rowView;
     }
 }

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/layout/message_list_item.xml

@@ -7,13 +7,13 @@
         android:id="@+id/message_topic_text"
         android:layout_width="fill_parent"
         android:layout_height="26dip"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
         android:ellipsize="marquee"
         android:singleLine="true"
         android:text="Topic: "
         android:textSize="12sp"
-        android:layout_toEndOf="@+id/message_date_text" />
+        android:layout_below="@+id/message_text"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
     <TextView
         android:id="@+id/message_text"
@@ -31,9 +31,10 @@
         android:layout_height="26dip"
         android:text="Time:"
         android:id="@+id/message_date_text"
-        android:layout_alignTop="@+id/message_topic_text"
-        android:layout_alignParentStart="true"
-        android:textSize="12dip" />
+        android:textSize="12dip"
+        android:layout_below="@+id/message_text"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
 
 
 </RelativeLayout>

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/layout/subscription_list_item.xml

@@ -45,7 +45,7 @@
         android:layout_marginRight="6dip"
         android:contentDescription="TODO"
         android:src="@drawable/ic_delete"
-        android:layout_alignTop="@+id/icon"
-        android:layout_alignEnd="@+id/message_text" />
+        android:layout_alignEnd="@+id/message_text"
+        android:layout_alignParentRight="true" />
 
 </RelativeLayout>