diff options
| author | Andreas Straub <andy@strb.org> | 2015-07-19 14:09:49 +0200 |
|---|---|---|
| committer | Andreas Straub <andy@strb.org> | 2015-07-19 22:24:03 +0200 |
| commit | 6f67469bda0ffe97cb8cd8d400affed5a17c34c5 (patch) | |
| tree | 613d1076eff9802f4cdb47b8998db69ec688cb14 /src/main/res/layout/activity_edit_account.xml | |
| parent | 9c4d55f82ce50391ac09b4f7d7a0f3576c014e56 (diff) | |
Refactor trust key ui and show in account details
Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.
EditAccountActivity now shows the keys of other devices associated with
that account.
Diffstat (limited to 'src/main/res/layout/activity_edit_account.xml')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index df20e6f2..3d65365d 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -368,7 +368,7 @@ android:layout_height="wrap_content" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:text="@string/axolotl_fingerprint"/> + android:text="@string/this_device_axolotl_fingerprint"/> </LinearLayout> <LinearLayout @@ -444,6 +444,37 @@ </RelativeLayout> </LinearLayout> + <LinearLayout + android:id="@+id/other_device_keys_card" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> + + <TextView + android:id="@+id/other_device_keys_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:text="@string/other_devices"/> + + <LinearLayout + android:id="@+id/other_device_keys" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:showDividers="middle" > + </LinearLayout> + </LinearLayout> </LinearLayout> </ScrollView> |