Fix rotary wheel scrolling for activities

fmeum · Oct 26, 2024 · 8c90fad · 8c90fad
1 parent 993eb9a
commit 8c90fad
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/authenticator/src/main/java/me/henneke/wearauthn/complication/ComplicationConfigActivity.kt b/authenticator/src/main/java/me/henneke/wearauthn/complication/ComplicationConfigActivity.kt
@@ -35,6 +35,12 @@ class ShortcutPicker : PreferenceFragment() {
         preferenceScreen.setTitle(R.string.preference_screen_title_shortcut_picker)
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        // Enable rotary wheel scrolling.
+        view?.requestFocus()
+    }
+
     override fun onPreferenceTreeClick(
         preferenceScreen: PreferenceScreen?,
         preference: Preference?

diff --git a/authenticator/src/main/java/me/henneke/wearauthn/ui/main/AuthenticatorMainMenu.kt b/authenticator/src/main/java/me/henneke/wearauthn/ui/main/AuthenticatorMainMenu.kt
@@ -90,6 +90,12 @@ class AuthenticatorMainMenu : PreferenceFragment(), CoroutineScope, Logging {
         addPreferencesFromResource(R.xml.preferences_authenticator)
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        // Enable rotary wheel scrolling.
+        view?.requestFocus()
+    }
+
     override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         bluetoothSettingsPreference =

diff --git a/authenticator/src/main/java/me/henneke/wearauthn/ui/main/ResidentCredentialsList.kt b/authenticator/src/main/java/me/henneke/wearauthn/ui/main/ResidentCredentialsList.kt
@@ -27,6 +27,12 @@ class ResidentCredentialsPreferenceFragment : PreferenceFragment() {
         createCredentialList()
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        // Enable rotary wheel scrolling.
+        view?.requestFocus()
+    }
+
     private fun createCredentialList() {
         preferenceScreen = preferenceManager.createPreferenceScreen(context)
         val credentialsPerRp = AuthenticatorContext.getAllResidentCredentials(context)

diff --git a/authenticator/src/main/res/layout/activity_about.xml b/authenticator/src/main/res/layout/activity_about.xml
@@ -6,6 +6,8 @@
     android:fillViewport="true"
     tools:context="me.henneke.wearauthn.ui.main.AboutActivity">
 
+    <requestFocus />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/authenticator/src/main/res/layout/dialog_text.xml b/authenticator/src/main/res/layout/dialog_text.xml
@@ -7,6 +7,8 @@
     android:overScrollMode="never"
     android:scrollbars="none">
 
+    <requestFocus />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"