oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fixed auto-initiate layout on GB.

This commit is contained in:
Moxie Marlinspike 2012-09-12 19:47:40 -07:00
parent 110b436ea2
commit 4715512194
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -75,7 +75,7 @@
<activity android:name=".AutoInitiateActivity"
android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="@string/textsecure_messaging_detected"
android:label="@string/textsecure_detected"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".ViewIdentityActivity"

41
res/layout/auto_initiate_activity.xml
View File

@ -3,8 +3,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip">
android:paddingLeft="16dip"
android:paddingRight="16dip">
<TextView android:id="@+id/description_text"
android:layout_width="fill_parent"
@ -12,24 +12,31 @@
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session"/>
android:text="@string/you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session"/>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:gravity="right">
<Button android:id="@+id/initiate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/initiate_exchange"
android:gravity="center"/>
<Button android:id="@+id/cancel_button"
android:text="@string/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"/>
<TableLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="*">
<TableRow>
<Button android:id="@+id/initiate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/initiate_exchange"
android:gravity="center"/>
<Button android:id="@+id/cancel_button"
android:text="@string/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"/>
</TableRow>
</TableLayout>
</LinearLayout>
</LinearLayout>

2
res/values/strings.xml
View File

@ -273,7 +273,7 @@
<string name="create_passphrase">Create Passphrase</string>
<string name="enter_passphrase">Enter Passphrase</string>
<string name="select_contacts">Select Contacts</string>
<string name="textsecure_messaging_detected">TextSecure Messaging Detected</string>
<string name="textsecure_detected">TextSecure Detected</string>
<string name="public_identity_key">Public Identity Key</string>
<string name="change_passphrase2">Change Passphrase</string>
<string name="verify_session">Verify Session</string>