diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-20 22:47:52 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-20 22:47:52 +0200 |
| commit | d3728e504f9673e97536d9bd519097c3df961035 (patch) | |
| tree | 00207e961ca1f49d83a6c5f3a43289fabb0e8145 /src/main/res/layout | |
| parent | 893a1a0958d4b9f6d3ba5f81ee29b9341fdc07c5 (diff) | |
| parent | 9ce2cfa3d2e8aac80f8e73855a879baad78dad0d (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/dialog_show_password.xml | 19 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 1 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml new file mode 100644 index 000000000..dba0690cb --- /dev/null +++ b/src/main/res/layout/dialog_show_password.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp" > + + <TextView + android:id="@+id/password" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="monospace" + android:textSize="?attr/TextSizeHeadline" + android:fontFamily="monospace" + android:layout_gravity="center_horizontal" + android:textColor="@color/black87" > + </TextView> + +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 14aea096f..60a566187 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -59,6 +59,7 @@ android:autoLink="web" android:textColorLink="@color/dark" android:textColor="@color/dark" + android:maxLines="256" android:textColorHighlight="@color/grey800" android:textSize="?attr/TextSizeBody" /> diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 2617c1212..26c24509e 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -60,6 +60,7 @@ android:autoLink="web" android:textColorLink="@color/black54" android:textColor="@color/black54" + android:maxLines="256" android:textColorHighlight="@color/grey500" android:textSize="?attr/TextSizeBody" /> |