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

Commit 9cdd1108 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "catalyst-firmware-version" into main 

* changes:
  Migrate "Build number" preference
  Migrate "Kernel version" preference
  Migrate "Baseband version" preference
parents 072d0d84 9cbb04c5

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

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.firmwareversion



import android.content.Context

import android.os.SystemProperties

import androidx.preference.Preference

import com.android.settings.R

import com.android.settings.Utils

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 BasebandVersionPreference :

    PreferenceMetadata,

    PreferenceSummaryProvider,

    PreferenceAvailabilityProvider,

    PreferenceBinding {



    override val key: String

        get() = "base_band"



    override val title: Int

        get() = R.string.baseband_version



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

        SystemProperties.get(BASEBAND_PROPERTY, context.getString(R.string.device_info_default))



    override fun isAvailable(context: Context) = !Utils.isWifiOnly(context)



    override fun bind(preference: Preference, metadata: PreferenceMetadata) {

        super.bind(preference, metadata)

        preference.isSelectable = false

        preference.isCopyingEnabled = true

    }



    companion object {

        const val BASEBAND_PROPERTY: String = "gsm.version.baseband"

    }

}

// LINT.ThenChange(BasebandVersionPreferenceController.java)

src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.core.BasePreferenceController;



// LINT.IfChange

public class BasebandVersionPreferenceController extends BasePreferenceController {



    @VisibleForTesting
@@ -45,3 +46,4 @@ public class BasebandVersionPreferenceController extends BasePreferenceControlle 
                mContext.getString(R.string.device_info_default));

    }

}

// LINT.ThenChange(BasebandVersionPreference.kt)

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

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider 
            +PreferenceWidget("os_firmware_version", R.string.firmware_version)

            +PreferenceWidget("security_key", R.string.security_patch)

            +PreferenceWidget("module_version", R.string.module_version)

            +PreferenceWidget("base_band", R.string.baseband_version)

            +PreferenceWidget("kernel_version", R.string.kernel_version)

            +PreferenceWidget("os_build_number", R.string.build_number)

            +BasebandVersionPreference()

            +KernelVersionPreference()

            +SimpleBuildNumberPreference()

        }



    private class PreferenceWidget(override val key: String, override val title: Int) :

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

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.firmwareversion



import android.content.Context

import androidx.preference.Preference

import com.android.settings.R

import com.android.settingslib.DeviceInfoUtils

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.preference.PreferenceBinding



// LINT.IfChange

class KernelVersionPreference : PreferenceMetadata, PreferenceSummaryProvider, PreferenceBinding {



    override val key: String

        get() = "kernel_version"



    override val title: Int

        get() = R.string.kernel_version



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

        DeviceInfoUtils.getFormattedKernelVersion(context)



    override fun bind(preference: Preference, metadata: PreferenceMetadata) {

        super.bind(preference, metadata)

        preference.isSelectable = false

        preference.isCopyingEnabled = true

    }

}

// LINT.ThenChange(KernelVersionPreferenceController.java)

src/com/android/settings/deviceinfo/firmwareversion/KernelVersionPreferenceController.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import com.android.settings.core.BasePreferenceController;

import com.android.settingslib.DeviceInfoUtils;



// LINT.IfChange

public class KernelVersionPreferenceController extends BasePreferenceController {



    public KernelVersionPreferenceController(Context context, String preferenceKey) {
@@ -37,3 +38,4 @@ public class KernelVersionPreferenceController extends BasePreferenceController 
        return DeviceInfoUtils.getFormattedKernelVersion(mContext);

    }

}

// LINT.ThenChange(KernelVersionPreference.kt)