summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorNagesh Susarla <nageshs@google.com>2014-11-19 14:09:41 -0800
committerNagesh Susarla <nageshs@google.com>2014-11-19 14:09:41 -0800
commit109db5b4e1f7915b53c3738a165881564a374e4b (patch)
treed99428992fc085dc044a20a4624bcd07aa764944 /samples
parent34b5d8e7a0b437e3f59e2c48cc6bad88bc295958 (diff)
Update browseable for MessagingService.
1. layout fixes 2. name changes in sample. (redo of ag/586904 which was lost from lmp-docs) Change-Id: I3a2afafb5b878ba90b8ae6314220af19b3dfbb09
Diffstat (limited to 'samples')
-rw-r--r--samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml1
-rw-r--r--samples/browseable/MessagingService/res/layout/fragment_message_me.xml1
-rw-r--r--samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java8
3 files changed, 4 insertions, 6 deletions
diff --git a/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml b/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml
index 8f7b60a23..6f4f88bac 100644
--- a/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml
+++ b/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml
@@ -61,7 +61,6 @@
android:layout_above="@id/clear"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:maxLines="20"
android:scrollbars="vertical"/>
</RelativeLayout>
</LinearLayout>
diff --git a/samples/browseable/MessagingService/res/layout/fragment_message_me.xml b/samples/browseable/MessagingService/res/layout/fragment_message_me.xml
index d01c5137a..29a8c441a 100644
--- a/samples/browseable/MessagingService/res/layout/fragment_message_me.xml
+++ b/samples/browseable/MessagingService/res/layout/fragment_message_me.xml
@@ -47,7 +47,6 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:maxLines="20"
android:scrollbars="vertical"/>
<Button
android:layout_width="match_parent"
diff --git a/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java b/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java
index 210e061f0..7425df499 100644
--- a/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java
+++ b/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java
@@ -45,10 +45,10 @@ public class Conversations {
* Senders of the said messages.
*/
private static final String[] PARTICIPANTS = new String[]{
- "John Rambo",
- "Han Solo",
- "Rocky Balboa",
- "Lara Croft"
+ "John Smith",
+ "Robert Lawrence",
+ "James Smith",
+ "Jane Doe"
};
static class Conversation {