Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '452-hide-identities-initially' into 'master'

Browse Source 
Hide Identity Selector When Adding Contact

Closes #452

See merge request !233
This commit is contained in:
Ernir Erlingsson
2016-07-06 20:29:18 +00:00
parent ba86690ce0 b99650b070
commit e9789435cc
5 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/res/layout-land/fragment_keyagreement_id.xml
View File

@@ -38,7 +38,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/your_nickname"/>
android:text="@string/your_nickname"
android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -46,7 +47,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:background="@drawable/spinner_border"
android:spinnerMode="dropdown"/>
android:spinnerMode="dropdown"
android:visibility="gone"/>
<TextView
android:id="@+id/faceToFaceView"

6
briar-android/res/layout-land/invitation_bluetooth_start.xml
View File

@@ -38,7 +38,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/your_nickname"/>
android:text="@string/your_nickname"
android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -46,7 +47,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:background="@drawable/spinner_border"
android:spinnerMode="dropdown"/>
android:spinnerMode="dropdown"
android:visibility="gone"/>
<TextView
android:id="@+id/faceToFaceView"

6
briar-android/res/layout/fragment_keyagreement_id.xml
View File

@@ -20,7 +20,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/your_nickname"/>
android:text="@string/your_nickname"
android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -28,7 +29,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:background="@drawable/spinner_border"
android:spinnerMode="dropdown"/>
android:spinnerMode="dropdown"
android:visibility="gone"/>
<ImageView
android:id="@+id/imageView"

6
briar-android/res/layout/invitation_bluetooth_start.xml
View File

@@ -20,7 +20,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/your_nickname"/>
android:text="@string/your_nickname"
android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -28,7 +29,8 @@
android:layout_height="wrap_content"
android:background="@drawable/spinner_border"
android:layout_marginTop="@dimen/margin_medium"
android:spinnerMode="dropdown"/>
android:spinnerMode="dropdown"
android:visibility="gone"/>
<ImageView
android:id="@+id/imageView"