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

ReceiveKeyActivity -> ReceiveKeyDialog

Browse Source 
Closes #3158
// FREEBIE
This commit is contained in:
Jake McGinty
2015-05-12 16:21:10 -07:00
committed by Moxie Marlinspike
parent fab2296927
commit fa39c23d44
8 changed files with 229 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
res/layout/receive_key_activity.xml
View File

@@ -1,47 +0,0 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:background="@drawable/background_pattern_repeat">
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center">
<LinearLayout android:paddingRight="16dip"
android:paddingLeft="16dip"
android:paddingTop="10dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<TextView style="@style/Registration.Description"
android:id="@+id/description_text"
android:layout_width="fill_parent"
android:layout_marginBottom="16dip"
android:layout_marginTop="16dip"/>
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginBottom="7dip"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
android:text="@android:string/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<Button android:id="@+id/ok_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/receive_key_activity__complete"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
</ScrollView>

12
res/layout/receive_key_dialog.xml Normal file
View File

@@ -0,0 +1,12 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView style="@style/Registration.Description"
android:id="@+id/description_text"
android:layout_width="fill_parent"
android:layout_marginBottom="16dip"
android:layout_marginTop="16dip"/>
</FrameLayout>

4
res/values/strings.xml
View File

@@ -569,8 +569,8 @@
<string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
<string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once.</string>
<!-- receive_key_activity -->
<string name="receive_key_activity__complete">Complete</string>
<!-- receive_key_dialog -->
<string name="receive_key_dialog__complete">Complete</string>
<!-- registration_activity -->
<string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">