From e394d17751ded0dbb60b2d75b4f6d4cca5e61bc1 Mon Sep 17 00:00:00 2001
From: Raghuram Subramani <raghus2247@gmail.com>
Date: Sun, 13 Oct 2024 14:21:42 +0530
Subject: get compilation working

---
 configpanel/Android.mk                                                | 1 -
 configpanel/AndroidManifest.xml                                       | 1 +
 .../src/org/lineageos/settings/device/ButtonSettingsActivity.java     | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'configpanel')

diff --git a/configpanel/Android.mk b/configpanel/Android.mk
index c44d4ca..bb603c8 100644
--- a/configpanel/Android.mk
+++ b/configpanel/Android.mk
@@ -12,7 +12,6 @@ LOCAL_PRODUCT_MODULE := true
 LOCAL_USE_AAPT2 := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.core_core \
     org.lineageos.settings.resources
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/configpanel/AndroidManifest.xml b/configpanel/AndroidManifest.xml
index b7c7905..35c466d 100644
--- a/configpanel/AndroidManifest.xml
+++ b/configpanel/AndroidManifest.xml
@@ -17,6 +17,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.lineageos.settings.device"
+    xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="6"
     android:versionName="2.5"
     android:sharedUserId="android.uid.system">
diff --git a/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java b/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java
index 98e1e2e..aca9793 100644
--- a/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java
+++ b/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java
@@ -20,13 +20,13 @@ package org.lineageos.settings.device;
 import android.os.Bundle;
 
 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
-import com.android.settingslib.widget.R;
 
 public class ButtonSettingsActivity extends CollapsingToolbarBaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getFragmentManager().beginTransaction().replace(R.id.content_frame,
+        getFragmentManager().beginTransaction().replace(
+                com.android.settingslib.collapsingtoolbar.R.id.content_frame,
                 new ButtonSettingsFragment()).commit();
     }
 }
-- 
cgit v1.2.3