From 9fc3158ad2c2beba5d366579d92a8d049e8f4a50 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 12 Jul 2023 11:34:20 +0530
Subject: [PATCH 1/2] Settings: add preference for license id

Change-Id: I60872ebd4df79b977b8a93926b3d3436e8bb8ab0
---
 res/values/cm_strings.xml                     |  5 +-
 res/xml/my_device_info.xml                    | 10 +++
 .../LicenseIDDetailPreferenceController.java  | 69 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e2148f8077d..4c9c31695a5 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -200,7 +200,10 @@
 
     <!-- Warning message for the sd card setup -->
     <string name="storage_warning_internal">Warning: This option may not work properly or lead to data loss and is therefore not recommended!</string>
-    
+
+    <!-- /e/ license ID -->
+    <string name="e_license_id_title">/e/ OS license ID</string>
+
     <!-- /e/ Sentry -->
     <string name="sentry_userid_title">Sentry User ID</string>
 
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 4b274143235..4e06f46e731 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -127,6 +127,16 @@
         android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
         settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
 
+    <!-- /e/ OS License ID -->
+    <Preference
+        android:key="e_license_id"
+        android:order="43"
+        android:title="@string/e_license_id_title"
+        android:summary="@string/summary_placeholder"
+        android:selectable="false"
+        settings:enableCopying="true"
+        settings:controller="com.android.settings.deviceinfo.firmwareversion.LicenseIDDetailPreferenceController"/>
+
     <!--IP address -->
     <Preference
         android:key="wifi_ip_address"
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java
new file mode 100644
index 00000000000..1de2363d5f6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2023 MURENA SAS
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.slices.Sliceable;
+
+
+public class LicenseIDDetailPreferenceController extends BasePreferenceController {
+
+    private static final String TAG = "LicenseIDDetailPreferenceController";
+
+    public LicenseIDDetailPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean useDynamicSliceSummary() {
+        return true;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        String eLicenseID = Settings.Secure.getStringForUser(
+                mContext.getContentResolver(), Settings.Secure.E_LICENSE_ID,
+                UserHandle.USER_CURRENT);
+        if (eLicenseID == null) {
+            return mContext.getString(R.string.unknown);
+        }
+        return eLicenseID;
+    }
+
+    @Override
+    public void copy() {
+        Sliceable.setCopyContent(mContext, getSummary(),
+                mContext.getText(R.string.sentry_userid_title));
+    }
+}
-- 
GitLab


From 061a7823f6f35e29f07acc47d7904717c45228f0 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Thu, 13 Jul 2023 10:47:22 +0530
Subject: [PATCH 2/2] Settings: Move position of preference

Change-Id: I2dc7c7ea73c5d3f53287534a859f5194266eb078
---
 res/xml/my_device_info.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 4e06f46e731..7fd82b0ad40 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -127,16 +127,6 @@
         android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
         settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
 
-    <!-- /e/ OS License ID -->
-    <Preference
-        android:key="e_license_id"
-        android:order="43"
-        android:title="@string/e_license_id_title"
-        android:summary="@string/summary_placeholder"
-        android:selectable="false"
-        settings:enableCopying="true"
-        settings:controller="com.android.settings.deviceinfo.firmwareversion.LicenseIDDetailPreferenceController"/>
-
     <!--IP address -->
     <Preference
         android:key="wifi_ip_address"
@@ -182,6 +172,16 @@
         android:summary="@string/summary_placeholder"
         android:selectable="false"/>
 
+    <!-- /e/ OS License ID -->
+    <Preference
+        android:key="e_license_id"
+        android:order="49"
+        android:title="@string/e_license_id_title"
+        android:summary="@string/summary_placeholder"
+        android:selectable="false"
+        settings:enableCopying="true"
+        settings:controller="com.android.settings.deviceinfo.firmwareversion.LicenseIDDetailPreferenceController"/>
+
     <!-- Manual -->
     <Preference
         android:key="manual"
-- 
GitLab