KeyHandler: Update to S

Change-Id: I68c6c0bc4d02f515a75293150e45b5bb083b0b26

KeyHandler/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2018, 2021 The LineageOS Project
+     Copyright (C) 2018, 2021-2022 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="@string/device_settings_app_name"
-        android:theme="@style/Theme.Main"
+        android:theme="@style/Theme.SubSettingsBase"
         android:defaultToDeviceProtectedStorage="true"
         android:directBootAware="true">
 

KeyHandler/src/org/lineageos/settings/device/ButtonSettingsActivity.kt

@@ -1,19 +1,20 @@
 /*
- * Copyright (C) 2021 The LineageOS Project
+ * Copyright (C) 2021-2022 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.lineageos.settings.device
 
-import android.R
-import android.preference.PreferenceActivity
 import android.os.Bundle
 
-class ButtonSettingsActivity : PreferenceActivity() {
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity
+import com.android.settingslib.collapsingtoolbar.R
+
+class ButtonSettingsActivity : CollapsingToolbarBaseActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         fragmentManager.beginTransaction().replace(
-            R.id.content,
+            R.id.content_frame,
             ButtonSettingsFragment()
         ).commit()
     }