diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
| commit | 34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch) | |
| tree | f8fcf0aced9b106facff2e50405a19288931da6b /OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml | |
| parent | b73ad7d87e7ddef03c17b4983f526c0613403df6 (diff) | |
| parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
| download | open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2 open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml new file mode 100644 index 000000000..49018fee1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml @@ -0,0 +1,25 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/full_screen_dialog_done" + style="@style/Widget.AppCompat.ActionButton" + android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <!-- + android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking + https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/ + --> + <TextView + android:id="@+id/full_screen_dialog_done_text" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center_vertical" + android:paddingRight="16dp" + android:paddingEnd="16dp" + style="@style/Widget.AppCompat.Light.ActionBar.TabText" + android:textAllCaps="true" + android:textSize="14sp" + android:filterTouchesWhenObscured="true" + android:text="Done (set in-code!)" /> + +</FrameLayout>
\ No newline at end of file |