From 1eb438576d862df8bf8c7221a6bebee7e8dd85f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 6 Jul 2015 16:21:48 +0200
Subject: Better YubiKey UX flow for error handling

---
 OpenKeychain/src/main/res/layout/nfc_activity.xml | 158 ----------------------
 1 file changed, 158 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/nfc_activity.xml

(limited to 'OpenKeychain/src/main/res/layout/nfc_activity.xml')

diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
deleted file mode 100644
index 992f8c14d..000000000
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
-        android:id="@+id/view_animator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateLayoutChanges="true"
-        android:inAnimation="@anim/fade_in"
-        android:measureAllChildren="false"
-        android:minHeight="?listPreferredItemHeightSmall"
-        android:outAnimation="@anim/fade_out"
-        android:paddingBottom="16dp"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
-        android:paddingTop="16dp"
-        custom:initialView="3">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/nfc_activity_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nfc_text"
-                android:textAppearance="@android:style/TextAppearance.Medium" />
-
-            <ImageView
-                android:id="@+id/nfc_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_text"
-                android:layout_marginTop="8dp"
-                android:adjustViewBounds="true"
-                android:background="@android:color/transparent"
-                android:src="@drawable/yubikey_phone" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/nfc_activity_text2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nfc_wait"
-                android:textAppearance="@android:style/TextAppearance.Medium" />
-
-            <ProgressBar
-                style="?android:attr/progressBarStyleLarge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:padding="8dp" />
-
-            <!-- placeholder to retain dialog size -->
-            <ImageView
-                android:id="@+id/nfc_image_placeholder1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_text2"
-                android:layout_marginTop="8dp"
-                android:adjustViewBounds="true"
-                android:background="@android:color/transparent"
-                android:src="@drawable/yubikey_phone"
-                android:visibility="invisible" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/nfc_activity_text3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nfc_finished"
-                android:textAppearance="@android:style/TextAppearance.Medium" />
-
-            <!-- placeholder to retain dialog size -->
-            <ImageView
-                android:id="@+id/nfc_image_placeholder2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_text3"
-                android:layout_marginTop="8dp"
-                android:adjustViewBounds="true"
-                android:background="@android:color/transparent"
-                android:src="@drawable/yubikey_phone"
-                android:visibility="invisible" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:adjustViewBounds="true"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_check_circle_black_48dp" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/nfc_activity_text_placeholder"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text=""
-                android:textAppearance="@android:style/TextAppearance.Medium" />
-
-            <!-- placeholder to retain dialog size -->
-            <ImageView
-                android:id="@+id/nfc_image_placeholder3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_text_placeholder"
-                android:layout_marginTop="8dp"
-                android:adjustViewBounds="true"
-                android:background="@android:color/transparent"
-                android:src="@drawable/yubikey_phone"
-                android:visibility="invisible" />
-
-            <TextView
-                android:id="@+id/nfc_activity_error_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:textAppearance="@android:style/TextAppearance.Medium"
-                android:textColor="@color/android_red_dark"
-                tools:text="Error text" />
-
-
-        </RelativeLayout>
-
-    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
-
-</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3