Merge "[Catalyst] Migrate About phone > Model > Hardware version" into main (46d5841e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/appfunctions/DeviceStateConfig.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoScreen
		import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionScreen
		import com.android.settings.deviceinfo.hardwareinfo.DeviceModelPreference
		import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoScreen
		import com.android.settings.deviceinfo.hardwareinfo.HardwareVersionPreference
		import com.android.settings.deviceinfo.legal.LegalSettingsScreen
		import com.android.settings.deviceinfo.legal.ModuleLicensesScreen
		import com.android.settings.deviceinfo.storage.StoragePreferenceScreen
		@@ -552,6 +553,11 @@ fun getDeviceStateItemList() =
		settingKey = DeviceModelPreference.KEY,
		settingScreenKey = HardwareInfoScreen.KEY,
		),
		DeviceStateItemConfig(
		enabled = true,
		settingKey = HardwareVersionPreference.KEY,
		settingScreenKey = HardwareInfoScreen.KEY,
		),
		DeviceStateItemConfig(
		enabled = true,
		settingKey = AppInfoStorageScreen.KEY,

src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoScreen.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ class HardwareInfoScreen :

		override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
		+DeviceModelPreference()
		+HardwareVersionPreference()
		}

		companion object {

src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.text.TextUtils;
		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;

		// LINT.IfChange
		public class HardwareRevisionPreferenceController extends BasePreferenceController {

		public HardwareRevisionPreferenceController(Context context, String preferenceKey) {
		@@ -45,3 +46,4 @@ public class HardwareRevisionPreferenceController extends BasePreferenceControll
		return SystemProperties.get("ro.boot.hardware.revision");
		}
		}
		// LINT.ThenChange(HardwareVersionPreference.kt)

src/com/android/settings/deviceinfo/hardwareinfo/HardwareVersionPreference.kt

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.deviceinfo.hardwareinfo

		import android.content.Context
		import android.os.SystemProperties
		import com.android.settings.R
		import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.PreferenceSummaryProvider
		import com.android.settingslib.preference.PreferenceBinding

		// LINT.IfChange
		class HardwareVersionPreference :
		PreferenceMetadata,
		PreferenceBinding,
		PreferenceSummaryProvider,
		PreferenceAvailabilityProvider {
		override val key: String
		get() = KEY

		override val title: Int
		get() = R.string.hardware_revision

		override fun getSummary(context: Context): CharSequence? =
		SystemProperties.get("ro.boot.hardware.revision")

		override fun isAvailable(context: Context) =
		context.resources.getBoolean(R.bool.config_show_device_model) &&
		getSummary(context)?.isNotEmpty() == true

		override fun createWidget(context: Context) =
		super.createWidget(context).apply {
		isCopyingEnabled = true
		isSelectable = false
		}

		companion object {
		const val KEY = "hardware_info_device_revision"
		}
		}
		// LINT.ThenChange(HardwareRevisionPreferenceController.java)

tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import org.robolectric.RobolectricTestRunner;
		import org.robolectric.annotation.Config;
		import org.robolectric.shadows.ShadowSystemProperties;

		// LINT.IfChange
		@RunWith(RobolectricTestRunner.class)
		@Config(shadows = {ShadowSystemProperties.class})
		public class HardwareRevisionPreferenceControllerTest {
		@@ -77,3 +78,4 @@ public class HardwareRevisionPreferenceControllerTest {
		assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
		}
		}
		// LINT.ThenChange(HardwareVersionPreferenceTest.kt)