Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64845bc2 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Support device state for "Android version" screen 

NO_IFTTT=Catalyst only

Bug: 389128850
Flag: com.android.settings.flags.catalyst_firmware_version
Test: devtool
Change-Id: Id17f63c812d1afa86e39e8af8d4b3ec862176714
parent f00cebda

AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,15 @@ 
                       android:value="true" />

        </activity>



        <activity android:name=".Settings$FirmwareVersionActivity"

            android:label="@string/firmware_version"

            android:exported="true">

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_about_device"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name=".Settings$LockScreenSettingsActivity"

            android:label="@string/lockscreen_settings_title"

src/com/android/settings/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import androidx.annotation.Nullable; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.biometrics.face.FaceSettings;

import com.android.settings.communal.CommunalPreferenceController;

import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionScreen;

import com.android.settings.enterprise.EnterprisePrivacySettings;

import com.android.settings.network.MobileNetworkIntentConverter;

import com.android.settings.overlay.FeatureFactory;
@@ -116,6 +117,11 @@ public class Settings extends SettingsActivity { 
    public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }

    public static class SmartAutoRotateSettingsActivity extends SettingsActivity { /* empty */ }

    public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }

    public static class FirmwareVersionActivity extends CatalystSettingsActivity {

        public FirmwareVersionActivity() {

            super(FirmwareVersionScreen.KEY);

        }

    }

    public static class ModuleLicensesActivity extends SettingsActivity { /* empty */ }

    public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreference.kt

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.preference.Preference 
import com.android.internal.app.PlatLogoActivity

import com.android.settings.R

import com.android.settings.Utils

import com.android.settings.contract.TAG_DEVICE_STATE_PREFERENCE

import com.android.settingslib.RestrictedLockUtils

import com.android.settingslib.RestrictedLockUtilsInternal

import com.android.settingslib.metadata.PreferenceMetadata
@@ -47,6 +48,8 @@ class FirmwareVersionDetailPreference : 
    override val title: Int

        get() = R.string.firmware_version



    override fun tags(context: Context) = arrayOf(TAG_DEVICE_STATE_PREFERENCE)



    override fun isIndexable(context: Context) = false



    override fun intent(context: Context): Intent? =

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt

+10 −0
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ package com.android.settings.deviceinfo.firmwareversion 
import android.content.Context

import android.os.Build

import com.android.settings.R

import com.android.settings.Settings.FirmwareVersionActivity

import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy
@@ -28,6 +32,8 @@ import com.android.settingslib.preference.PreferenceScreenCreator 
@ProvidePreferenceScreen(FirmwareVersionScreen.KEY)

class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider {



    override fun tags(context: Context) = arrayOf(TAG_DEVICE_STATE_SCREEN)



    override fun isFlagEnabled(context: Context) = Flags.catalystFirmwareVersion()



    override val key: String
@@ -42,8 +48,12 @@ class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider 
    override val keywords: Int

        get() = R.string.keywords_android_version



    // Once fully launch, change to PreferenceFragment and clean up FirmwareVersionScreenTest

    override fun fragmentClass() = FirmwareVersionSettings::class.java



    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =

        makeLaunchIntent(context, FirmwareVersionActivity::class.java, metadata?.key)



    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(context, this) {

            +FirmwareVersionDetailPreference()

src/com/android/settings/deviceinfo/firmwareversion/SimpleBuildNumberPreference.kt

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.text.BidiFormatter 
import android.view.View.LAYOUT_DIRECTION_RTL

import androidx.preference.Preference

import com.android.settings.R

import com.android.settings.contract.TAG_DEVICE_STATE_PREFERENCE

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.preference.PreferenceBinding
@@ -36,6 +37,8 @@ class SimpleBuildNumberPreference : 
    override val title: Int

        get() = R.string.build_number



    override fun tags(context: Context) = arrayOf(TAG_DEVICE_STATE_PREFERENCE)



    override fun isIndexable(context: Context) = false



    override fun getSummary(context: Context): CharSequence? {