diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-08 15:47:32 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-03-08 15:47:32 +0100 |
| commit | e8875adaa4d3961a78983dbfd793692c94931736 (patch) | |
| tree | ca468e36f351df3fe75e1528412cf4359e796f82 /OpenKeychain/src | |
| parent | 5379f64d08ad22e2f7fbc38de9fa79b093c0c7f3 (diff) | |
| download | open-keychain-e8875adaa4d3961a78983dbfd793692c94931736.tar.gz open-keychain-e8875adaa4d3961a78983dbfd793692c94931736.tar.bz2 open-keychain-e8875adaa4d3961a78983dbfd793692c94931736.zip | |
Using new size qualifiers
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/res/layout-w400dp/passphrase_dialog_backup_code.xml | 73 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout-w600dp/backup_code_fragment.xml (renamed from OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml) | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout-w600dp/security_token_operation_activity.xml (renamed from OpenKeychain/src/main/res/layout-land/security_token_operation_activity.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml | 2 |
4 files changed, 74 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout-w400dp/passphrase_dialog_backup_code.xml b/OpenKeychain/src/main/res/layout-w400dp/passphrase_dialog_backup_code.xml new file mode 100644 index 000000000..426616c75 --- /dev/null +++ b/OpenKeychain/src/main/res/layout-w400dp/passphrase_dialog_backup_code.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="14dp" + android:paddingTop="14dp"> + + <LinearLayout + android:id="@+id/input" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/passphrase_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:text="@string/passphrase_for_backup" + android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="8dp"> + + <com.github.pinball83.maskededittext.MaskedEditText + android:id="@+id/backup_code" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:textSize="16dp" + android:textStyle="bold" + android:typeface="monospace" + app:mask="****-****-****-****-****-****" + app:maskIconColor="@color/colorPrimary" + app:notMaskedSymbol="*" + tools:ignore="SpUsage" /> + + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:id="@+id/progress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:orientation="horizontal" + android:visibility="invisible"> + + <ProgressBar + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" /> + + <TextView + style="?android:attr/textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_unlock" /> + + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-w600dp/backup_code_fragment.xml index 0a4f97d53..6cea50a32 100644 --- a/OpenKeychain/src/main/res/layout-land/backup_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout-w600dp/backup_code_fragment.xml @@ -84,11 +84,9 @@ android:textSize="18dp" android:textStyle="bold" android:typeface="monospace" - app:deleteChar="\u00a0" app:mask="****-****-****-****-****-****" app:maskIconColor="@color/colorPrimary" app:notMaskedSymbol="*" - app:replacementChar="\u00a0" tools:ignore="SpUsage" /> </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> diff --git a/OpenKeychain/src/main/res/layout-land/security_token_operation_activity.xml b/OpenKeychain/src/main/res/layout-w600dp/security_token_operation_activity.xml index cf0edac8c..cf0edac8c 100644 --- a/OpenKeychain/src/main/res/layout-land/security_token_operation_activity.xml +++ b/OpenKeychain/src/main/res/layout-w600dp/security_token_operation_activity.xml diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml index a55033380..ff4088b63 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml @@ -35,7 +35,7 @@ android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:textSize="18dp" + android:textSize="14dp" android:textStyle="bold" android:typeface="monospace" app:mask="****-****-****-****-****-****" |