Merge pull request #39 from loki-project/multi-device-stage-2

[Stage 2] Multi device

res/layout/activity_seed.xml

@@ -123,8 +123,7 @@
             android:layout_height="50dp"
             android:background="@color/transparent"
             android:textColor="@color/signal_primary"
-            android:text="Link Device (Coming Soon)"
-            android:alpha="0.24"
+            android:text="Link Device"
             android:elevation="0dp"
             android:stateListAnimator="@null" />
 

res/layout/profile_preference_view.xml

@@ -30,6 +30,14 @@
                   android:layout_height="wrap_content"
                   tools:text="+14151231234"/>
 
+        <TextView
+            android:id="@+id/tag"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:textColor="#A2A2A2"
+            tools:text="Secondary Device" />
+
     </LinearLayout>
 
 </LinearLayout>

res/values/strings.xml

@@ -1572,6 +1572,7 @@
     <!-- Conversation list activity -->
     <string name="activity_conversation_list_empty_state_message">Looks like you don\'t have any conversations yet. Get started by messaging a friend.</string>
     <!-- Settings activity -->
+    <string name="activity_settings_secondary_device_tag">Secondary device</string>
     <string name="activity_settings_public_key_copied_message">Copied to clipboard</string>
     <string name="activity_settings_share_public_key_button_title">Share Public Key</string>
     <string name="activity_settings_show_qr_code_button_title">Show QR Code</string>

res/xml/preferences.xml

@@ -42,7 +42,7 @@
                 android:icon="@drawable/icon_qr_code"/>
 
     <Preference android:key="preference_category_link_device"
-                android:title="Link Device (Coming Soon)"
+                android:title="Link Device"
                 android:icon="@drawable/icon_link"/>
 
     <Preference android:key="preference_category_seed"