Commit 195e2afb authored by Mygod's avatar Mygod

Fix keyboard navigations

parent 3dbc5f41
...@@ -29,6 +29,7 @@ import android.os.Bundle ...@@ -29,6 +29,7 @@ import android.os.Bundle
import android.provider.Settings import android.provider.Settings
import android.support.design.widget.BottomSheetDialog import android.support.design.widget.BottomSheetDialog
import android.support.v7.preference.PreferenceDialogFragmentCompat import android.support.v7.preference.PreferenceDialogFragmentCompat
import android.support.v7.widget.DefaultItemAnimator
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater import android.view.LayoutInflater
...@@ -107,10 +108,12 @@ class BottomSheetPreferenceDialogFragment : PreferenceDialogFragmentCompat() { ...@@ -107,10 +108,12 @@ class BottomSheetPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
recycler.setPadding(0, padding, 0, padding) recycler.setPadding(0, padding, 0, padding)
recycler.setHasFixedSize(true) recycler.setHasFixedSize(true)
recycler.layoutManager = LinearLayoutManager(activity) recycler.layoutManager = LinearLayoutManager(activity)
recycler.itemAnimator = DefaultItemAnimator()
recycler.adapter = IconListAdapter(dialog) recycler.adapter = IconListAdapter(dialog)
recycler.layoutParams = ViewGroup.LayoutParams( recycler.layoutParams = ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
dialog.setContentView(recycler) dialog.setContentView(recycler)
dialog.findViewById<View>(R.id.touch_outside)!!.isFocusable = false
return dialog return dialog
} }
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item>
<selector android:enterFadeDuration="@android:integer/config_mediumAnimTime" <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
android:exitFadeDuration="@android:integer/config_mediumAnimTime"> android:exitFadeDuration="@android:integer/config_mediumAnimTime">
...@@ -8,4 +8,5 @@ ...@@ -8,4 +8,5 @@
</item> </item>
</selector> </selector>
</item> </item>
</ripple> <item android:drawable="?android:attr/selectableItemBackground"/>
</layer-list>
...@@ -5,4 +5,7 @@ ...@@ -5,4 +5,7 @@
<item android:state_selected="true"> <item android:state_selected="true">
<color android:color="@color/material_primary_100"/> <color android:color="@color/material_primary_100"/>
</item> </item>
<item android:state_pressed="true">
<color android:color="#12000000"/>
</item>
</selector> </selector>
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<AutoSummaryEditTextPreference <AutoSummaryEditTextPreference
android:key="proxy" android:key="proxy"
app:pref_summaryHasText="%s" app:pref_summaryHasText="%s"
android:singleLine="true"
android:title="@string/proxy"/> android:title="@string/proxy"/>
<AutoSummaryEditTextPreference <AutoSummaryEditTextPreference
android:key="remotePortNum" android:key="remotePortNum"
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
app:pref_summaryPasswordSubstituteLength="0" app:pref_summaryPasswordSubstituteLength="0"
android:key="sitekey" android:key="sitekey"
app:pref_summaryHasText="%s" app:pref_summaryHasText="%s"
android:singleLine="true"
android:title="@string/sitekey"/> android:title="@string/sitekey"/>
<SimpleMenuPreference <SimpleMenuPreference
android:key="encMethod" android:key="encMethod"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:elevation="4dp" android:elevation="4dp"
android:touchscreenBlocksFocus="false"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:id="@+id/toolbar" /> android:id="@+id/toolbar" />
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment