diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt index 9de5af5a606b7e630c51156d6b9944214733a972..8fe7dc1f5bc8095e6ad13a5f7c6dbb2795fb2471 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt @@ -3,7 +3,6 @@ package de.kuschku.quasseldroid.ui.settings.about import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.view.ViewCompat import android.support.v7.widget.DividerItemDecoration import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView @@ -172,7 +171,6 @@ class AboutSettingsFragment : DaggerFragment() { ) )) libraries.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL)) - ViewCompat.setNestedScrollingEnabled(libraries, false) contributors.layoutManager = LinearLayoutManager(context) contributors.adapter = ContributorAdapter(listOf( @@ -203,7 +201,6 @@ class AboutSettingsFragment : DaggerFragment() { ) )) contributors.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL)) - ViewCompat.setNestedScrollingEnabled(contributors, false) return view } diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt index 8b6435a233dabd84b53519b4e2c9f7cf38ffc7e9..2f09fa5aa0dc61ab6c77d2ee2b2b951b8e1649f9 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import android.os.Handler import android.os.HandlerThread -import android.support.v4.view.ViewCompat import android.support.v7.recyclerview.extensions.ListAdapter import android.support.v7.util.DiffUtil import android.support.v7.widget.DividerItemDecoration @@ -63,7 +62,6 @@ class CrashSettingsFragment : ServiceBoundFragment() { list.layoutManager = LinearLayoutManager(context) list.adapter = adapter list.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL)) - ViewCompat.setNestedScrollingEnabled(list, false) handler.post { val crashDir = this.crashDir diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml index 9ddcca6501850130e86a239153e01c27ff092353..da20df2b303cdce18fbfdfbceb6fcc2024e0cc2a 100644 --- a/app/src/main/res/layout-sw720dp/activity_settings.xml +++ b/app/src/main/res/layout-sw720dp/activity_settings.xml @@ -37,7 +37,7 @@ android:clipToPadding="false" app:cardElevation="4dp"> - <android.support.v4.widget.NestedScrollView + <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical"> @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" tools:layout="@layout/fragment_about" /> - </android.support.v4.widget.NestedScrollView> + </ScrollView> </android.support.v7.widget.CardView> </LinearLayout> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 8ed200484e6b8198498f08675f047daf9f57519c..4769f0e8ed28c9140c3715e119412e8677d09130 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -25,7 +25,7 @@ </android.support.design.widget.AppBarLayout> - <android.support.v4.widget.NestedScrollView + <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical"> @@ -34,7 +34,7 @@ android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="wrap_content" /> - </android.support.v4.widget.NestedScrollView> + </ScrollView> </LinearLayout> </android.support.v4.widget.DrawerLayout> \ No newline at end of file