From 9b9e244077df7bfb9f6202d493dc3dda3c37a2b0 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 9 Aug 2023 18:41:00 +0530
Subject: [PATCH 1/2] Revert "Settings: Move position of preference"

This reverts commit c7609ecbafed32a5b44b57367f39d3fe045bd129.
---
 res/xml/my_device_info.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index aef28eb8739..3401c2711cd 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -138,6 +138,15 @@
             android:selectable="false"
             settings:enableCopying="true"
             settings:controller="com.android.settings.deviceinfo.firmwareversion.LineageVersionDetailPreferenceController"/>
+
+        <!-- /e/ OS License ID -->
+        <Preference
+            android:key="e_license_id"
+            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"/>
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -187,16 +196,6 @@
             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


From a29b345e061ca36a71dd924dd7b34fcb81dd5755 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 9 Aug 2023 18:41:01 +0530
Subject: [PATCH 2/2] Revert "Settings: add preference for license id"

This reverts commit 62bfeb1eb75c377d3860c28e46cd0f1c3d693744.
---
 res/values/cm_strings.xml                     |  3 -
 res/xml/my_device_info.xml                    |  9 ---
 .../LicenseIDDetailPreferenceController.java  | 69 -------------------
 3 files changed, 81 deletions(-)
 delete 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 8cdef90d249..48133a6c83a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -206,9 +206,6 @@
     <!-- /e/ version -->
     <string name="e_version">/e/ OS version</string>
 
-    <!-- /e/ license ID -->
-    <string name="e_license_id_title">/e/ OS license ID</string>
-
     <!-- /e/ legal. -->
     <string name="elicense_title">/e/ legal</string>
 
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 3401c2711cd..16d6f9c0d83 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -138,15 +138,6 @@
             android:selectable="false"
             settings:enableCopying="true"
             settings:controller="com.android.settings.deviceinfo.firmwareversion.LineageVersionDetailPreferenceController"/>
-
-        <!-- /e/ OS License ID -->
-        <Preference
-            android:key="e_license_id"
-            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"/>
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java
deleted file mode 100644
index 1de2363d5f6..00000000000
--- a/src/com/android/settings/deviceinfo/firmwareversion/LicenseIDDetailPreferenceController.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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