Add manufactured year into hardware info page
Bug: 285471557 Test: manual visually Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
This commit is contained in:
@@ -2642,6 +2642,8 @@
|
|||||||
<string name="model_info">Model</string>
|
<string name="model_info">Model</string>
|
||||||
<!-- Label for device's hardware revision value [CHAR LIMIT=40] -->
|
<!-- Label for device's hardware revision value [CHAR LIMIT=40] -->
|
||||||
<string name="hardware_revision">Hardware version</string>
|
<string name="hardware_revision">Hardware version</string>
|
||||||
|
<!-- Label for device's manufactured year value [CHAR LIMIT=40] -->
|
||||||
|
<string name="manufactured_year">Manufactured year</string>
|
||||||
<!-- About phone screen, fcc equipment id label [CHAR LIMIT=40] -->
|
<!-- About phone screen, fcc equipment id label [CHAR LIMIT=40] -->
|
||||||
<string name="fcc_equipment_id">Equipment ID</string>
|
<string name="fcc_equipment_id">Equipment ID</string>
|
||||||
<!-- About phone screen, setting option name [CHAR LIMIT=40] -->
|
<!-- About phone screen, setting option name [CHAR LIMIT=40] -->
|
||||||
|
@@ -48,4 +48,13 @@
|
|||||||
settings:controller="com.android.settings.deviceinfo.hardwareinfo.HardwareRevisionPreferenceController"
|
settings:controller="com.android.settings.deviceinfo.hardwareinfo.HardwareRevisionPreferenceController"
|
||||||
settings:enableCopying="true"/>
|
settings:enableCopying="true"/>
|
||||||
|
|
||||||
|
<!-- Manufactured year -->
|
||||||
|
<Preference
|
||||||
|
android:key="hardware_info_manufactured_year"
|
||||||
|
android:title="@string/manufactured_year"
|
||||||
|
android:summary="@string/summary_placeholder"
|
||||||
|
android:selectable="false"
|
||||||
|
settings:controller="com.android.settings.deviceinfo.hardwareinfo.ManufacturedYearPreferenceController"
|
||||||
|
settings:enableCopying="true"/>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
@@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Feature provider for hardware info
|
||||||
|
*/
|
||||||
|
interface HardwareInfoFeatureProvider {
|
||||||
|
/**
|
||||||
|
* Returns the manufactured year
|
||||||
|
*/
|
||||||
|
val manufacturedYear: String?
|
||||||
|
}
|
@@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Feature provider for hardware info
|
||||||
|
*/
|
||||||
|
object HardwareInfoFeatureProviderImpl : HardwareInfoFeatureProvider {
|
||||||
|
override val manufacturedYear: String?
|
||||||
|
get() = null
|
||||||
|
}
|
@@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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 com.android.settings.core.BasePreferenceController
|
||||||
|
import com.android.settings.overlay.FeatureFactory
|
||||||
|
|
||||||
|
/** Preference controller for Manufactured Year. */
|
||||||
|
class ManufacturedYearPreferenceController(context: Context, preferenceKey: String) :
|
||||||
|
BasePreferenceController(context, preferenceKey) {
|
||||||
|
private val year: String? =
|
||||||
|
FeatureFactory.getFactory(context).hardwareInfoFeatureProvider.manufacturedYear
|
||||||
|
|
||||||
|
override fun getAvailabilityStatus(): Int =
|
||||||
|
if (!year.isNullOrEmpty()) AVAILABLE else UNSUPPORTED_ON_DEVICE
|
||||||
|
|
||||||
|
override fun getSummary(): CharSequence = year ?: ""
|
||||||
|
}
|
@@ -33,6 +33,7 @@ import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
|
|||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
||||||
import com.android.settings.dashboard.DashboardFeatureProvider;
|
import com.android.settings.dashboard.DashboardFeatureProvider;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||||
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
||||||
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
|
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
|
||||||
@@ -109,6 +110,11 @@ public abstract class FeatureFactory {
|
|||||||
*/
|
*/
|
||||||
public abstract SuggestionFeatureProvider getSuggestionFeatureProvider();
|
public abstract SuggestionFeatureProvider getSuggestionFeatureProvider();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves implementation for Hardware Info feature.
|
||||||
|
*/
|
||||||
|
public abstract HardwareInfoFeatureProvider getHardwareInfoFeatureProvider();
|
||||||
|
|
||||||
public abstract SupportFeatureProvider getSupportFeatureProvider(Context context);
|
public abstract SupportFeatureProvider getSupportFeatureProvider(Context context);
|
||||||
|
|
||||||
public abstract MetricsFeatureProvider getMetricsFeatureProvider();
|
public abstract MetricsFeatureProvider getMetricsFeatureProvider();
|
||||||
|
@@ -47,6 +47,8 @@ import com.android.settings.dashboard.DashboardFeatureProvider;
|
|||||||
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
|
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
|
||||||
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
||||||
@@ -115,6 +117,11 @@ public class FeatureFactoryImpl extends FeatureFactory {
|
|||||||
private AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
|
private AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
|
||||||
private WifiFeatureProvider mWifiFeatureProvider;
|
private WifiFeatureProvider mWifiFeatureProvider;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HardwareInfoFeatureProvider getHardwareInfoFeatureProvider() {
|
||||||
|
return HardwareInfoFeatureProviderImpl.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
|
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
|
||||||
return null;
|
return null;
|
||||||
|
@@ -31,6 +31,8 @@ import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
|
|||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
||||||
import com.android.settings.dashboard.DashboardFeatureProvider;
|
import com.android.settings.dashboard.DashboardFeatureProvider;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||||
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
||||||
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
|
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
|
||||||
@@ -287,6 +289,11 @@ public class FakeFeatureFactory extends FeatureFactory {
|
|||||||
return mAccessibilityMetricsFeatureProvider;
|
return mAccessibilityMetricsFeatureProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HardwareInfoFeatureProvider getHardwareInfoFeatureProvider() {
|
||||||
|
return HardwareInfoFeatureProviderImpl.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
|
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
|
||||||
return mAdvancedVpnFeatureProvider;
|
return mAdvancedVpnFeatureProvider;
|
||||||
|
@@ -27,6 +27,7 @@ import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider
|
|||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider
|
import com.android.settings.bluetooth.BluetoothFeatureProvider
|
||||||
import com.android.settings.dashboard.DashboardFeatureProvider
|
import com.android.settings.dashboard.DashboardFeatureProvider
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider
|
||||||
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider
|
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider
|
||||||
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider
|
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider
|
||||||
@@ -175,6 +176,10 @@ class FakeFeatureFactory : FeatureFactory() {
|
|||||||
TODO("Not yet implemented")
|
TODO("Not yet implemented")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun getHardwareInfoFeatureProvider(): HardwareInfoFeatureProvider {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
override fun getAdvancedVpnFeatureProvider(): AdvancedVpnFeatureProvider {
|
override fun getAdvancedVpnFeatureProvider(): AdvancedVpnFeatureProvider {
|
||||||
TODO("Not yet implemented")
|
TODO("Not yet implemented")
|
||||||
}
|
}
|
||||||
|
@@ -29,6 +29,8 @@ import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
|
|||||||
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
import com.android.settings.bluetooth.BluetoothFeatureProvider;
|
||||||
import com.android.settings.dashboard.DashboardFeatureProvider;
|
import com.android.settings.dashboard.DashboardFeatureProvider;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider;
|
||||||
|
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl;
|
||||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
|
||||||
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
|
||||||
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
|
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
|
||||||
@@ -273,6 +275,11 @@ public class FakeFeatureFactory extends FeatureFactory {
|
|||||||
return mAccessibilityMetricsFeatureProvider;
|
return mAccessibilityMetricsFeatureProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HardwareInfoFeatureProvider getHardwareInfoFeatureProvider() {
|
||||||
|
return HardwareInfoFeatureProviderImpl.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
|
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
|
||||||
return mAdvancedVpnFeatureProvider;
|
return mAdvancedVpnFeatureProvider;
|
||||||
|
Reference in New Issue
Block a user