aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-11-11 19:26:57 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2016-01-05 20:33:48 +0100
commitf8d6b0bb467cf126b3e1bf295f584b533280ebef (patch)
tree2c2bb7977d90cd06dbee46ead01553cbd7641417 /OpenKeychain/src/main/res/layout
parente0f8d078629dcd04dced3a59bc45209b27a27b8b (diff)
downloadopen-keychain-f8d6b0bb467cf126b3e1bf295f584b533280ebef.tar.gz
open-keychain-f8d6b0bb467cf126b3e1bf295f584b533280ebef.tar.bz2
open-keychain-f8d6b0bb467cf126b3e1bf295f584b533280ebef.zip
passdialog: switch to ViewAnimator
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/passphrase_dialog.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index a2e6af27c..cd6b3e87b 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
- android:orientation="vertical">
+ android:orientation="vertical"
+ custom:initialView="0">
<LinearLayout
- android:id="@+id/input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -34,7 +36,6 @@
</LinearLayout>
<LinearLayout
- android:id="@+id/progress"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -57,4 +58,4 @@
</LinearLayout>
-</RelativeLayout> \ No newline at end of file
+</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> \ No newline at end of file