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

Commit 69abbf45 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Make VibrationIntensitySliderPreference.storage val nonnull 

VibrationIntensitySliderPreference.storage is initialized by
`storage(Context)` method, which causes implicit sequence dependency.

NO_IFTTT=Catalyst only

Bug: 390338213
Flag: EXEMPT refactor
Test: atest
Change-Id: Icbf722c46dade8947b6f03363725f68768a1a0b2
parent cac78b65

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

+3 −1
Original line number Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

package com.android.settings.accessibility



import android.content.Context

import android.os.VibrationAttributes

import android.provider.Settings

import com.android.settings.R



/** Accessibility settings for alarm vibration, as a slider. */

// LINT.IfChange

class AlarmVibrationIntensitySliderPreference :

class AlarmVibrationIntensitySliderPreference(context: Context) :

    VibrationIntensitySliderPreference(

        context = context,

        key = KEY,

        vibrationUsage = VibrationAttributes.USAGE_ALARM,

        title = R.string.accessibility_alarm_vibration_title,

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

+5 −2
Original line number Diff line number Diff line
@@ -23,12 +23,15 @@ import com.android.settingslib.metadata.PreferenceAvailabilityProvider 


/** Accessibility settings for media vibration, as a slider. */

// LINT.IfChange

class MediaVibrationIntensitySliderPreference :

class MediaVibrationIntensitySliderPreference(context: Context) :

    VibrationIntensitySliderPreference(

        context = context,

        key = KEY,

        vibrationUsage = VibrationAttributes.USAGE_MEDIA,

        title = R.string.accessibility_media_vibration_title,

    ), PreferenceAvailabilityProvider {

    ),

    PreferenceAvailabilityProvider {



    override val keywords: Int

        get() = R.string.keywords_media_vibration

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

+3 −1
Original line number Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

package com.android.settings.accessibility



import android.content.Context

import android.os.VibrationAttributes

import android.provider.Settings

import com.android.settings.R



/** Accessibility settings for notification vibration, using an intensity slider. */

// LINT.IfChange

class NotificationVibrationIntensitySliderPreference :

class NotificationVibrationIntensitySliderPreference(context: Context) :

    VibrationIntensitySliderPreference(

        context = context,

        key = KEY,

        vibrationUsage = VibrationAttributes.USAGE_NOTIFICATION,

        title = R.string.accessibility_notification_vibration_title,

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

+3 −1
Original line number Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

package com.android.settings.accessibility



import android.content.Context

import android.os.VibrationAttributes

import android.provider.Settings

import com.android.settings.R



/** Accessibility settings for ring vibration, using an intensity slider. */

// LINT.IfChange

class RingVibrationIntensitySliderPreference :

class RingVibrationIntensitySliderPreference(context: Context) :

    VibrationIntensitySliderPreference(

        context = context,

        key = KEY,

        vibrationUsage = VibrationAttributes.USAGE_RINGTONE,

        title = R.string.accessibility_ring_vibration_title,

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

+3 −1
Original line number Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

package com.android.settings.accessibility



import android.content.Context

import android.os.VibrationAttributes

import android.provider.Settings

import com.android.settings.R



/** Accessibility settings for touch haptic feedback, as a slider. */

// LINT.IfChange

class TouchVibrationIntensitySliderPreference :

class TouchVibrationIntensitySliderPreference(context: Context) :

    VibrationIntensitySliderPreference(

        context = context,

        key = KEY,

        vibrationUsage = VibrationAttributes.USAGE_TOUCH,

        title = R.string.accessibility_touch_vibration_title,