| commit | d072ebe344f9c7b95c94b59dc63f125901679d88 | [log] [tgz] |
|---|---|---|
| author | Nagesh Susarla <nageshs@google.com> | Thu Nov 13 20:20:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 20:20:11 2014 +0000 |
| tree | 898c8aee4ae523149c26d784e6921e66e76c5ac0 | |
| parent | 7328f323104cf9065675749f347d1f91cea90976 [diff] | |
| parent | 73d1988336124ae81421efc4c649960a159bc74d [diff] |
am 73d19883: Merge "Fix layout for the messaging sample" into lmp-docs * commit '73d1988336124ae81421efc4c649960a159bc74d': Fix layout for the messaging sample
diff --git a/notification/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml b/notification/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml index 8f7b60a..6f4f88b 100644 --- a/notification/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml +++ b/notification/MessagingService/Application/src/main/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/notification/MessagingService/Application/src/main/res/layout/fragment_message_me.xml b/notification/MessagingService/Application/src/main/res/layout/fragment_message_me.xml index d01c513..29a8c44 100644 --- a/notification/MessagingService/Application/src/main/res/layout/fragment_message_me.xml +++ b/notification/MessagingService/Application/src/main/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"