From 621850c33cb8097fab673910a4577b5427fcb190 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Mon, 11 Dec 2023 16:04:59 +0000
Subject: msm8996-common: configpanel: Re-style

This brings user interface inline with Settings.

Change-Id: I73f8a68a8bf99897af8a93030367af046fb5a5b7
---
 configpanel/Android.bp                             | 26 +++++++++++++++++++
 configpanel/Android.mk                             | 29 ----------------------
 configpanel/AndroidManifest.xml                    |  3 ++-
 .../settings/device/ButtonSettingsActivity.java    |  2 +-
 .../settings/device/ButtonSettingsFragment.java    |  3 +--
 5 files changed, 30 insertions(+), 33 deletions(-)
 create mode 100644 configpanel/Android.bp
 delete mode 100644 configpanel/Android.mk

diff --git a/configpanel/Android.bp b/configpanel/Android.bp
new file mode 100644
index 0000000..0442aa7
--- /dev/null
+++ b/configpanel/Android.bp
@@ -0,0 +1,26 @@
+//
+// Copyright (C) 2017-2023 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+android_app {
+    name: "ConfigPanel",
+
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    certificate: "platform",
+    platform_apis: true,
+    privileged: true,
+    required: ["ZukPocketMode"],
+    product_specific: true,
+
+    static_libs: [
+        "org.lineageos.platform.internal",
+        "org.lineageos.settings.resources",
+    ],
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+}
diff --git a/configpanel/Android.mk b/configpanel/Android.mk
deleted file mode 100644
index c44d4ca..0000000
--- a/configpanel/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PACKAGE_NAME := ConfigPanel
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_REQUIRED_MODULES := ZukPocketMode
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.core_core \
-    org.lineageos.settings.resources
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    org.lineageos.platform.internal
-
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res \
-    $(TOP)/packages/resources/devicesettings/res
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_PACKAGE)
diff --git a/configpanel/AndroidManifest.xml b/configpanel/AndroidManifest.xml
index b7c7905..aa50112 100644
--- a/configpanel/AndroidManifest.xml
+++ b/configpanel/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2016 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017,2023 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.
@@ -28,6 +28,7 @@
 
     <application
         android:label="@string/device_settings_app_name"
+        android:theme="@style/Theme.SubSettingsBase"
         android:defaultToDeviceProtectedStorage="true"
         android:directBootAware="true">
 
diff --git a/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java b/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java
index 98e1e2e..0d2afc9 100644
--- a/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java
+++ b/configpanel/src/org/lineageos/settings/device/ButtonSettingsActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- *           (C) 2017 The LineageOS Project
+ *           (C) 2017,2023 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.
diff --git a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java
index 9605bdf..39057b3 100644
--- a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java
+++ b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- *           (C) 2017,2020-2021 The LineageOS Project
+ *           (C) 2017,2019-2023 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.
@@ -21,7 +21,6 @@ import android.app.ActionBar;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.MenuItem;
 
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
-- 
cgit v1.2.3