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

provisioning dialog rework

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty
2015-01-23 18:38:45 -10:00
committed by Moxie Marlinspike
parent 0c32001fe4
commit 2e253fb6a8
11 changed files with 123 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/values/strings.xml
View File

@@ -239,6 +239,22 @@
<string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passphrases don\'t match!</string>
<string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect old passphrase!</string>
<!-- DeviceProvisioningActivity -->
<string name="DeviceProvisioning_cancel">CANCEL</string>
<string name="DeviceProvisioning_continue">CONTINUE</string>
<string name="DeviceProvisioning_title">Link this device?</string>
<string name="DeviceProvisioning_content_intro">It will be able to</string>
<string name="DeviceProvisioning_content_bullets">
- Read all your messages
\n- Send messages in your name
</string>
<string name="DeviceProvisioning_content_progress_title">Adding device...</string>
<string name="DeviceProvisioning_content_progress_content">Adding new device...</string>
<string name="DeviceProvisioning_content_progress_success">Device added!</string>
<string name="DeviceProvisioning_content_progress_no_device">No device found.</string>
<string name="DeviceProvisioning_content_progress_network_error">Network error.</string>
<string name="DeviceProvisioning_content_progress_key_error">Invalid QR code.</string>
<!-- PassphrasePromptActivity -->
<string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
<string name="PassphrasePromptActivity_watermark_content_description">TextSecure icon</string>

9
res/values/styles.xml
View File

@@ -13,6 +13,15 @@
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="TextSecure.DialogActivity" parent="Theme.AppCompat">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">false</item>
</style>
<!-- ActionBar styles -->
<style name="TextSecure.DarkActionBar"
parent="@style/Widget.AppCompat.ActionBar">