TouchGestures: Adapt to Settings themeHEADs12.1

Signed-off-by: Anushek Prasal <anushekprasal@gmail.com>
Change-Id: I4cf28ee01eee9738c425badab85868748ccd854d

3 files changed, 9 insertions, 70 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 27d9573..e9ba9a7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,8 @@
     <application
         android:label="@string/touchscreen_gesture_settings_title"
         android:persistent="true"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
 
         <receiver android:name=".BootReceiver" android:enabled="true">
             <intent-filter android:priority="999999">
@@ -29,9 +30,7 @@
 
         <activity
             android:name=".TouchscreenGestureSettings"
-            android:label="@string/touchscreen_gesture_settings_title"
-            android:theme="@style/AppTheme">
-        </activity>
+            android:label="@string/touchscreen_gesture_settings_title" />
 
         <activity
             android:name=".ScreenOffLaunchGestureActivity"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 119820c..99b3d0b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,40 +15,11 @@
     limitations under the License.
 -->
 <resources>
-    <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+    <style name="AppTheme" parent="@style/Theme.SubSettingsBase">
         <item name="android:divider">@null</item>
         <item name="android:dividerHeight">0dp</item>
-        <item name="android:switchPreferenceStyle">@style/SettingsSwitchPreference</item>
-        <item name="android:preferenceStyle">@style/SettingsPreference</item>
-        <item name="android:dialogPreferenceStyle">@style/SettingsDialogPreference</item>
-        <item name="android:preferenceScreenStyle">@style/SettingsPreferenceScreen</item>
-        <item name="android:dialogTheme">@*android:style/Theme.DeviceDefault.Dialog</item>
-        <item name="android:alertDialogTheme">@*android:style/Theme.DeviceDefault.Dialog.Alert</item>
     </style>
 
-    <!-- Preferences -->
-    <style name="SettingsPreference" parent="@*android:style/Preference.DeviceDefault">
-        <item name="android:singleLineTitle">false</item>
-        <item name="android:iconSpaceReserved">true</item>
-    </style>
-
-    <style name="SettingsSwitchPreference" parent="@*android:style/Preference.DeviceDefault.SwitchPreference">
-        <item name="android:iconSpaceReserved">true</item>
-        <item name="android:singleLineTitle">false</item>
-    </style>
-
-    <style name="SettingsDialogPreference" parent="@*android:style/Preference.DeviceDefault.DialogPreference">
-        <item name="android:singleLineTitle">false</item>
-        <item name="android:iconSpaceReserved">true</item>
-    </style>
-
-    <style name="SettingsPreferenceScreen" parent="@*android:style/Preference.DeviceDefault.PreferenceScreen">
-        <item name="android:singleLineTitle">false</item>
-        <item name="android:iconSpaceReserved">true</item>
-    </style>
-
-    <style name="SettingsListPreference" parent="SettingsPreference"/>
-
     <style name="AppTheme.Transparent" parent="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
diff --git a/src/com/android/touch/gestures/TouchscreenGestureSettings.java b/src/com/android/touch/gestures/TouchscreenGestureSettings.java
index be13837..66d1c7c 100644
--- a/src/com/android/touch/gestures/TouchscreenGestureSettings.java
+++ b/src/com/android/touch/gestures/TouchscreenGestureSettings.java
@@ -17,7 +17,6 @@
 
 package com.android.touch.gestures;
 
-import android.app.ActionBar;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
@@ -28,7 +27,6 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.view.MenuItem;
 
-import android.preference.PreferenceActivity;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragment;
@@ -37,12 +35,14 @@ import androidx.preference.PreferenceManager;
 import com.android.internal.custom.hardware.LineageHardwareManager;
 import com.android.internal.custom.hardware.TouchscreenGesture;
 
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+
 import com.android.touch.gestures.R;
 import com.android.touch.gestures.utils.ResourceUtils;
 
 import java.lang.System;
 
-public class TouchscreenGestureSettings extends PreferenceActivity
+public class TouchscreenGestureSettings extends CollapsingToolbarBaseActivity
         implements PreferenceFragment.OnPreferenceStartFragmentCallback {
 
     @Override
@@ -51,7 +51,7 @@ public class TouchscreenGestureSettings extends PreferenceActivity
 
         if (savedInstanceState == null) {
             getFragmentManager().beginTransaction()
-                    .replace(android.R.id.content, getNewFragment())
+                    .replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame, getNewFragment())
                     .commit();
         }
     }
@@ -63,8 +63,7 @@ public class TouchscreenGestureSettings extends PreferenceActivity
     @Override
     public boolean onPreferenceStartFragment(PreferenceFragment preferenceFragment,
             Preference preference) {
-        Fragment instantiate = Fragment.instantiate(this, preference.getFragment(),
-            preference.getExtras());
+        Fragment instantiate = Fragment.instantiate(this, preference.getFragment(), preference.getExtras());
         getFragmentManager().beginTransaction().replace(
                 android.R.id.content, instantiate).addToBackStack(preference.getKey()).commit();
 
@@ -77,17 +76,12 @@ public class TouchscreenGestureSettings extends PreferenceActivity
         private static final String TOUCHSCREEN_GESTURE_TITLE = KEY_TOUCHSCREEN_GESTURE + "_%s_title";
 
         private TouchscreenGesture[] mTouchscreenGestures;
-        private ActionBar actionBar;
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
             setPreferencesFromResource(R.xml.touchscreen_gesture_settings, rootKey);
 
-            actionBar = getActivity().getActionBar();
-            assert actionBar != null;
-            actionBar.setDisplayHomeAsUpEnabled(true);
-
             if (isTouchscreenGesturesSupported(getContext())) {
                 initTouchscreenGestures();
             }
@@ -209,30 +203,5 @@ public class TouchscreenGestureSettings extends PreferenceActivity
             intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
             context.sendBroadcastAsUser(intent, UserHandle.CURRENT);
         }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-        }
-
-        @Override
-        public void onResume() {
-            super.onResume();
-        }
-
-        @Override
-        public void onDestroy() {
-            super.onDestroy();
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
     }
 }