diff options
Diffstat (limited to 'configpanel')
| -rw-r--r-- | configpanel/Android.mk | 1 | ||||
| -rw-r--r-- | configpanel/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java | 4 |
3 files changed, 3 insertions, 3 deletions
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(); } } |