diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-27 22:47:43 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-27 22:47:43 +0100 |
| commit | 5b1d834f91c4b68929ad08fb9617152268999f6c (patch) | |
| tree | 609fde0043a5d9d9e8f16be5414025fe09f4553f /OpenKeychain/src/main/res | |
| parent | fd2f858b12974629c612d366017669f640bf3254 (diff) | |
| parent | 80c159056d8efc4dd82c36a2c168511d34d6e8b4 (diff) | |
| download | open-keychain-5b1d834f91c4b68929ad08fb9617152268999f6c.tar.gz open-keychain-5b1d834f91c4b68929ad08fb9617152268999f6c.tar.bz2 open-keychain-5b1d834f91c4b68929ad08fb9617152268999f6c.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/anim/rotate.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/anim/rotate_spin.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/indeterminate_progress.xml | 9 |
3 files changed, 25 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/anim/rotate.xml b/OpenKeychain/src/main/res/anim/rotate.xml new file mode 100644 index 000000000..3856fa081 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/rotate.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<rotate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromDegrees="0" + android:toDegrees="360" + android:pivotX="50%" + android:pivotY="50%" + android:duration="800" + android:interpolator="@android:anim/linear_interpolator" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/rotate_spin.xml b/OpenKeychain/src/main/res/anim/rotate_spin.xml new file mode 100644 index 000000000..e6ddec869 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/rotate_spin.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<rotate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromDegrees="0" + android:toDegrees="360" + android:pivotX="50%" + android:pivotY="50%" + android:duration="400" + android:interpolator="@android:anim/accelerate_decelerate_interpolator" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/indeterminate_progress.xml b/OpenKeychain/src/main/res/layout/indeterminate_progress.xml new file mode 100644 index 000000000..8515e83a4 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/indeterminate_progress.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> + +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:padding="0dp" + android:src="@drawable/ic_refresh_white_24dp" + style="@style/Widget.AppCompat.ActionButton" /> |