aboutsummaryrefslogtreecommitdiff
path: root/imagepicker/src
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-09 00:24:40 -0700
committerAllan Wang <me@allanwang.ca>2017-07-09 00:24:40 -0700
commit40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 (patch)
tree523f72bd0c53817815fd0ab1aa7c3124a3264745 /imagepicker/src
parentbcc7dd36752829b650b583fd6ee6168de3e6f95a (diff)
downloadkau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.gz
kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.bz2
kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.zip
Clean up gradle and test build
Diffstat (limited to 'imagepicker/src')
-rw-r--r--imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt4
-rw-r--r--imagepicker/src/main/res/values/styles.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt b/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt
index a236e64..47d57c2 100644
--- a/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt
+++ b/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt
@@ -39,8 +39,8 @@ abstract class ImagePickerActivityBase : AppCompatActivity(), LoaderManager.Load
draggableFrame.addListener(object : ElasticDragDismissFrameLayout.SystemChromeFader(this) {
override fun onDragDismissed() {
if (draggableFrame.translationY < 0) {
- window.returnTransition = TransitionInflater.from(this@ImagePickerActivityBase)
- .inflateTransition(R.transition.kau_about_return_upwards)
+// window.returnTransition = TransitionInflater.from(this@ImagePickerActivityBase)
+// .inflateTransition(R.transition.kau_about_return_upwards)
}
finishAfterTransition()
}
diff --git a/imagepicker/src/main/res/values/styles.xml b/imagepicker/src/main/res/values/styles.xml
index 1dc5149..e2d7280 100644
--- a/imagepicker/src/main/res/values/styles.xml
+++ b/imagepicker/src/main/res/values/styles.xml
@@ -1,8 +1,8 @@
<resources>
<style name="Kau.Translucent.ImagePicker">
- <item name="android:windowEnterTransition">@transition/kau_enter_slide_bottom</item>
- <item name="android:windowReturnTransition">@transition/kau_about_return_downward</item>
+ <!--<item name="android:windowEnterTransition">@transition/kau_enter_slide_bottom</item>-->
+ <!--<item name="android:windowReturnTransition">@transition/kau_about_return_downward</item>-->
</style>
</resources>