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

Device provisioning

Browse Source 
Closes #4553
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-11-19 10:21:19 -08:00
parent 02c37e815c
commit 7c0bf0c871
38 changed files with 1047 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/attrs.xml
View File

@@ -147,4 +147,13 @@
<attr name="circleColor" format="color"/>
</declare-styleable>
<declare-styleable name="ShapeScrim">
<attr name="shape" format="string"/>
<attr name="radius" format="float"/>
</declare-styleable>
<declare-styleable name="CameraView">
<attr name="camera" format="integer"/>
</declare-styleable>
</resources>

9
res/values/strings.xml
View File

@@ -345,12 +345,12 @@
<string name="DeviceProvisioningActivity_title">Link this device?</string>
<string name="DeviceProvisioningActivity_content_intro">It will be able to</string>
<string name="DeviceProvisioningActivity_content_bullets">
- Read all your messages
\n- Send messages in your name
• Read all your messages
\n• Send messages in your name
</string>
<string name="DeviceProvisioningActivity_content_progress_title">Linking device</string>
<string name="DeviceProvisioningActivity_content_progress_content">Linking new device...</string>
<string name="DeviceProvisioningActivity_content_progress_success">Device linked!</string>
<string name="DeviceProvisioningActivity_content_progress_success">Device approved!</string>
<string name="DeviceProvisioningActivity_content_progress_no_device">No device found.</string>
<string name="DeviceProvisioningActivity_content_progress_network_error">Network error.</string>
<string name="DeviceProvisioningActivity_content_progress_key_error">Invalid QR code.</string>
@@ -1128,6 +1128,9 @@
<!-- transport_selection_list_item -->
<string name="transport_selection_list_item__transport_icon">Transport icon</string>
<string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan the QR code displayed on the device to link</string>
<string name="device_link_fragment__link_device">Link device</string>
<string name="device_list_fragment__link_new_device">Link new device</string>
<!-- EOF -->

4
res/values/themes.xml
View File

@@ -188,7 +188,7 @@
<item name="pref_ic_app_protection">@drawable/ic_app_protection_black</item>
<item name="pref_ic_appearance">@drawable/ic_brightness_6_black</item>
<item name="pref_ic_chats">@drawable/ic_forum_black_32dp</item>
<item name="pref_ic_devices">@drawable/ic_devices_black_48dp</item>
<item name="pref_ic_devices">@drawable/ic_laptop_black_32dp</item>
<item name="pref_ic_advanced">@drawable/ic_advanced_black</item>
<item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
@@ -301,7 +301,7 @@
<item name="pref_ic_app_protection">@drawable/ic_app_protection_gray</item>
<item name="pref_ic_appearance">@drawable/ic_brightness_6_gray</item>
<item name="pref_ic_chats">@drawable/ic_forum_grey_32dp</item>
<item name="pref_ic_devices">@drawable/ic_devices_grey600_48dp</item>
<item name="pref_ic_devices">@drawable/ic_laptop_light_32dp</item>
<item name="pref_ic_advanced">@drawable/ic_advanced_gray</item>
<item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>