From f923e31682d35e8273184fe899e02d11dc16f8ae Mon Sep 17 00:00:00 2001 From: althafvly 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 | 3 + res/xml/my_device_info.xml | 10 +++ .../LicenseIDDetailPreferenceController.java | 69 +++++++++++++++++++ 3 files changed, 82 insertions(+) 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 520933f5531..3aa08f86c6f 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -218,6 +218,9 @@ Fast charging Disable to reduce the heat produced by the device while charging or to extend the lifespan of the battery + + /e/ OS license ID + Sentry User ID diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml index 0de8cdcc736..353a94ba10b 100644 --- a/res/xml/my_device_info.xml +++ b/res/xml/my_device_info.xml @@ -133,6 +133,16 @@ android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings" settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/> + + + . + */ + +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 2210727b5e8cabe989276aa5e0f05c9efb464bb3 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 13 Jul 2023 10:48:15 +0530 Subject: [PATCH 2/2] Settings: Move position of preference Change-Id: Ieea1ed7edc9a6180631f73f021fcc396b69323b1 --- 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 353a94ba10b..4c8fe935410 100644 --- a/res/xml/my_device_info.xml +++ b/res/xml/my_device_info.xml @@ -133,16 +133,6 @@ android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings" settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/> - - - + + +