Merge branch 'issue139' of https://github.com/liliakai/TextSecure into no_conversation_scroll

This commit is contained in:
Moxie Marlinspike 2013-03-10 14:54:32 -07:00
commit 6687aa0911

View File

@ -11,7 +11,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1.0" android:layout_weight="1.0"
android:drawSelectorOnTop="true" android:drawSelectorOnTop="true"
android:transcriptMode="alwaysScroll" android:transcriptMode="normal"
android:scrollbarAlwaysDrawVerticalTrack="false" android:scrollbarAlwaysDrawVerticalTrack="false"
android:scrollbarStyle="insideOverlay" android:scrollbarStyle="insideOverlay"
android:stackFromBottom="true" android:stackFromBottom="true"