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

Commit 56dd2523 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate Dial pad tones preference" into main

parents 9936dae2 898feed1

res/xml/sound_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ 


    <!-- Dial pad tones -->

    <SwitchPreferenceCompat

        android:key="dial_pad_tones"

        android:key="dtmf_tone"

        android:title="@string/dial_pad_tones_title"

        android:order="-50"/>

src/com/android/settings/notification/DialPadTonePreference.kt

0 → 100644
+35 −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.notification



import android.content.Context

import android.provider.Settings.System.DTMF_TONE_WHEN_DIALING

import com.android.settings.R

import com.android.settings.Utils

import com.android.settingslib.datastore.SettingsSystemStore

import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.SwitchPreference

import com.android.settingslib.preference.SwitchPreferenceBinding



// LINT.IfChange

class DialPadTonePreference :

    SwitchPreference(DTMF_TONE_WHEN_DIALING, R.string.dial_pad_tones_title),

    SwitchPreferenceBinding, PreferenceAvailabilityProvider {

    override fun storage(context: Context) = SettingsSystemStore.get(context)



    override fun isAvailable(context: Context) = Utils.isVoiceCapable(context)

}

// LINT.ThenChange(DialPadTonePreferenceController.java)
 
 No newline at end of file

src/com/android/settings/notification/DialPadTonePreferenceController.java

+6 −5
Original line number Diff line number Diff line
@@ -16,24 +16,24 @@ 


package com.android.settings.notification;



import static android.provider.Settings.System.DTMF_TONE_WHEN_DIALING;



import static com.android.settings.notification.SettingPref.TYPE_SYSTEM;



import android.content.Context;

import android.provider.Settings.System;



import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settingslib.core.lifecycle.Lifecycle;



// LINT.IfChange

public class DialPadTonePreferenceController extends SettingPrefController {



    private static final String KEY_DIAL_PAD_TONES = "dial_pad_tones";



    public DialPadTonePreferenceController(Context context, SettingsPreferenceFragment parent,

            Lifecycle lifecycle) {

        super(context, parent, lifecycle);

        mPreference = new SettingPref(

            TYPE_SYSTEM, KEY_DIAL_PAD_TONES, System.DTMF_TONE_WHEN_DIALING, DEFAULT_ON) {

        mPreference = new SettingPref(TYPE_SYSTEM, DTMF_TONE_WHEN_DIALING, DTMF_TONE_WHEN_DIALING,

                DEFAULT_ON) {

            @Override

            public boolean isApplicable(Context context) {

                return Utils.isVoiceCapable(context);
@@ -42,3 +42,4 @@ public class DialPadTonePreferenceController extends SettingPrefController { 
    }



}

// LINT.ThenChange(DialPadTonePreference.kt)

src/com/android/settings/notification/SoundScreen.kt

+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,10 @@ class SoundScreen : PreferenceScreenCreator { 


    override fun fragmentClass(): Class<out Fragment>? = SoundSettings::class.java



    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}

    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(this) {

            +DialPadTonePreference()

        }



    companion object {

        const val KEY = "sound_screen"

tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



// LINT.IfChange

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        com.android.settings.testutils.shadow.ShadowFragment.class,
@@ -123,3 +124,4 @@ public class DialPadTonePreferenceControllerTest { 
        assertThat(System.getInt(mContentResolver, System.DTMF_TONE_WHEN_DIALING, 1)).isEqualTo(0);

    }

}

// LINT.ThenChange(DialPadTonePreferenceTest.kt)