SPenActions: Revamp UI

Change-Id: I65eb1cc61f29e48e0223e5119be38234ba731e50

Author: bgcngm

packages/SPenActions/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
+     SPDX-FileCopyrightText: 2021-2026 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -18,7 +18,7 @@
         android:defaultToDeviceProtectedStorage="true"
         android:directBootAware="true"
         android:label="@string/app_name"
-        android:theme="@style/Theme.SubSettingsBase">
+        android:theme="@style/Theme.SubSettingsBase.Expressive">
 
         <activity
             android:name=".settings.SettingsActivity"

packages/SPenActions/res/xml/spen_settings.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
+     SPDX-FileCopyrightText: 2021-2026 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreferenceCompat
-        android:key="spen_bluetooth_enable"
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="spen_bluetooth_top_intro"
+        android:title="@string/spen_bluetooth_enable_summary" />
+
+    <com.android.settingslib.widget.MainSwitchPreference
         android:defaultValue="false"
-        android:title="@string/spen_bluetooth_enable_title"
-        android:summary="@string/spen_bluetooth_enable_summary" />
+        android:key="spen_bluetooth_enable"
+        android:title="@string/spen_bluetooth_enable_title" />
 
     <ListPreference
         android:key="spen_mode"
@@ -21,8 +24,4 @@
         android:title="@string/spen_mode_title"
         android:summary="%s" />
 
-    <com.android.settingslib.widget.ActionButtonsPreference
-        android:key="action_buttons"
-        android:dependency="spen_bluetooth_enable" />
-
 </PreferenceScreen>

packages/SPenActions/src/org/lineageos/spenactions/settings/SettingsFragment.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
+ * SPDX-FileCopyrightText: 2021-2026 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,37 +10,48 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.view.View;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreferenceCompat;
 
-import com.android.settingslib.widget.ActionButtonsPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.SettingsBasePreferenceFragment;
 
 import org.lineageos.spenactions.BluetoothUtils;
 import org.lineageos.spenactions.R;
 
-public class SettingsFragment extends PreferenceFragmentCompat
-        implements Preference.OnPreferenceChangeListener, View.OnClickListener {
+public class SettingsFragment extends SettingsBasePreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final int MENU_RESET = Menu.FIRST;
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.add(0, MENU_RESET, 0, R.string.spen_reset)
+                .setAlphabeticShortcut('r')
+                .setEnabled(true)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+    }
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setHasOptionsMenu(true);
         setPreferencesFromResource(R.xml.spen_settings, rootKey);
 
-        ActionButtonsPreference actionButtonsPreference =
-                findPreference(SettingsUtils.ACTION_BUTTONS);
-        actionButtonsPreference.setButton1Text(R.string.spen_reset);
-        actionButtonsPreference.setButton1OnClickListener(this);
-
-        SwitchPreferenceCompat enableBluetoothPreference =
-                findPreference(SettingsUtils.SPEN_BLUETOOTH_ENABLE);
-        enableBluetoothPreference.setOnPreferenceChangeListener(this);
+        MainSwitchPreference switchBar = findPreference(SettingsUtils.SPEN_BLUETOOTH_ENABLE);
+        switchBar.setOnPreferenceChangeListener(this);
     }
 
     @Override
-    public void onClick(View view) {
-        BluetoothUtils.resetSPenMAC(getActivity());
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == MENU_RESET) {
+            BluetoothUtils.resetSPenMAC(getActivity());
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override

packages/SPenActions/src/org/lineageos/spenactions/settings/SettingsUtils.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
+ * SPDX-FileCopyrightText: 2021-2026 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,7 +13,6 @@ public class SettingsUtils {
 
     public static final String SPEN_BLUETOOTH_ENABLE = "spen_bluetooth_enable";
     public static final String SPEN_MODE = "spen_mode";
-    public static final String ACTION_BUTTONS = "action_buttons";
 
     public static boolean isEnabled(Context context, String pref, boolean defValue) {
         return PreferenceManager.getDefaultSharedPreferences(context)