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

Commit caa87b9c authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Fix sensitivity to writability declarations" into main

parents 03d71f72 2000e9f9

src/com/android/settings/accessibility/VibrationMainSwitchPreference.kt

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.settingslib.metadata.MainSwitchPreference 
import com.android.settingslib.metadata.PreferenceLifecycleContext

import com.android.settingslib.metadata.PreferenceLifecycleProvider

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel



/** Accessibility settings for vibration. */

// LINT.IfChange
@@ -62,6 +63,9 @@ class VibrationMainSwitchPreference : 
        callingUid: Int,

    ) = ReadWritePermit.ALLOW



    override val sensitivityLevel: Int

        get() = SensitivityLevel.NO_SENSITIVITY



    override fun onResume(context: PreferenceLifecycleContext) {

        vibrator = context.getSystemService(Vibrator::class.java)

        context

src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settingslib.metadata.PreferenceLifecycleProvider 
import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.RangeValue

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.preference.PreferenceBinding

import com.android.settingslib.widget.UsageProgressBarPreference
@@ -113,6 +114,9 @@ class BatteryHeaderPreference : 
    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =

        ReadWritePermit.DISALLOW



    override val sensitivityLevel: Int

        get() = SensitivityLevel.NO_SENSITIVITY



    companion object {

        private const val KEY = "battery_header"

        private const val BATTERY_MAX_LEVEL: Long = 100L