TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 02:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into audio-view-design-update

Browse Source
This commit is contained in:
Anton Chekulaev
2020-10-26 17:53:39 +11:00
parent 7d9f5a4fd1 53a58acbd5
commit 82c5df48e7
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout-sw400dp/activity_restore.xml
View File

@@ -34,12 +34,15 @@
style="@style/SessionEditText"
android:id="@+id/mnemonicEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="28dp"
android:paddingBottom="28dp"
android:layout_height="80dp"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="center_vertical"
android:inputType="textMultiLine"
android:maxLines="2"
android:hint="@string/activity_restore_seed_edit_text_hint" />
<View

7
res/layout/activity_restore.xml
View File

@@ -34,10 +34,15 @@
style="@style/SmallSessionEditText"
android:id="@+id/mnemonicEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="80dp"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="10dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="center_vertical"
android:inputType="textMultiLine"
android:maxLines="2"
android:hint="@string/activity_restore_seed_edit_text_hint" />
<View