Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Show SoC Model rather than value of ro.board.platform if available

Browse Source 
* These properties were introduced in S, so why not use them?

Change-Id: I2abb584e140841c03f8daa7cc6c0107f24a0e234
This commit is contained in:
Tim Zimmermann
2023-02-12 09:53:42 +01:00
committed by Joey
parent d183b8f95c
commit 3a7ae660c1
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/evolution_strings.xml
View File

@@ -84,6 +84,6 @@
<string name="wifi_device_mac_addr">Use device MAC</string> <string name="wifi_device_mac_addr">Use device MAC</string>
<!-- Hardware info --> <!-- Hardware info -->
<string name="platform_revision">Platform</string> <string name="soc_model">SoC Model</string>
<string name="total_ram">Total RAM</string> <string name="total_ram">Total RAM</string>
</resources> </resources>

8
res/xml/hardware_info.xml
View File

@@ -30,13 +30,13 @@
settings:controller="com.android.settings.deviceinfo.hardwareinfo.DeviceModelPreferenceController" settings:controller="com.android.settings.deviceinfo.hardwareinfo.DeviceModelPreferenceController"
settings:enableCopying="true"/> settings:enableCopying="true"/>
<!-- Platform --> <!-- SoC Model -->
<Preference <Preference
android:key="hardware_info_platform" android:key="hardware_info_soc_model"
android:title="@string/platform_revision" android:title="@string/soc_model"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" android:selectable="false"
settings:controller="com.android.settings.deviceinfo.hardwareinfo.PlatformRevisionPreferenceController" settings:controller="com.android.settings.deviceinfo.hardwareinfo.SoCModelPreferenceController"
settings:enableCopying="true"/> settings:enableCopying="true"/>
<!-- Total RAM --> <!-- Total RAM -->

11
src/com/android/settings/deviceinfo/hardwareinfo/PlatformRevisionPreferenceController.java → src/com/android/settings/deviceinfo/hardwareinfo/SoCModelPreferenceController.java
View File

@@ -17,15 +17,16 @@
package com.android.settings.deviceinfo.hardwareinfo; package com.android.settings.deviceinfo.hardwareinfo;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.SystemProperties; import android.os.SystemProperties;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.Sliceable; import com.android.settings.slices.Sliceable;
public class PlatformRevisionPreferenceController extends BasePreferenceController { public class SoCModelPreferenceController extends BasePreferenceController {
public PlatformRevisionPreferenceController(Context context, String preferenceKey) { public SoCModelPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
} }
@@ -47,6 +48,12 @@ public class PlatformRevisionPreferenceController extends BasePreferenceControll
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
if (!Build.SOC_MODEL.equals(Build.UNKNOWN)) {
if (!Build.SOC_MANUFACTURER.equals(Build.UNKNOWN)) {
return Build.SOC_MANUFACTURER + " " + Build.SOC_MODEL;
}
return Build.SOC_MODEL;
}
return SystemProperties.get("ro.board.platform"); return SystemProperties.get("ro.board.platform");
} }
} }