From 62bfeb1eb75c377d3860c28e46cd0f1c3d693744 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 | 9 +++ .../LicenseIDDetailPreferenceController.java | 69 +++++++++++++++++++ 3 files changed, 81 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 48133a6c83a..8cdef90d249 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -206,6 +206,9 @@ /e/ OS version + + /e/ OS license ID + /e/ legal diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml index 16d6f9c0d83..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"/> + + + . + */ + +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 c7609ecbafed32a5b44b57367f39d3fe045bd129 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 13 Jul 2023 10:46:25 +0530 Subject: [PATCH 2/2] Settings: Move position of preference Change-Id: I810c96873fedb2c30a52f5610d1b24f2099fcf42 --- res/xml/my_device_info.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml index 3401c2711cd..aef28eb8739 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"/> - - - + + +