aboutsummaryrefslogtreecommitdiff
path: root/about/src/main/kotlin
diff options
context:
space:
mode:
authorAllan Wang <allanwang@google.com>2019-07-27 17:46:04 -0700
committerAllan Wang <allanwang@google.com>2019-07-27 17:46:04 -0700
commit50c8012e2fe88d6b275d1a3269033590962caa7f (patch)
tree65ebb32525be83441e6caac8362e3e9ae022bfd1 /about/src/main/kotlin
parent01058912580a3ecfe77eaf6af209e1c46a97f2d7 (diff)
parentd94017e6f6df67e80604111028ea16f6c7f4e077 (diff)
downloadkau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.gz
kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.bz2
kau-50c8012e2fe88d6b275d1a3269033590962caa7f.zip
Fix initial conflicts
Diffstat (limited to 'about/src/main/kotlin')
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt
index 814fd64..aae6cb0 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutPanelDelegate.kt
@@ -100,7 +100,7 @@ abstract class AboutPanelRecycler : AboutPanelContract {
recycler.adapter = adapter
recycler.itemAnimator = KauAnimator(
addAnimator = FadeScaleAnimatorAdd(scaleFactor = 0.7f, itemDelayFactor = 0.2f),
- changeAnimator = NoAnimatorChange()
+ changeAnimator = NoAnimatorChange
).apply { addDuration = 300; interpolator = AnimHolder.decelerateInterpolator(recycler.context) }
}