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

Commit beb14dbf authored by Yanting Yang's avatar Yanting Yang
Browse files

Remove silky flag from Sound for official release 

Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: Ica8217b3921235c9e79cf8f8b531637180552f3b
parent 31389702

res/xml/sound_settings.xml

+90 −120
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/sound_settings"

    android:key="sound_settings"

    settings:keywords="@string/keywords_sounds"

    settings:initialExpandedChildrenCount="9">

    settings:keywords="@string/keywords_sounds">



    <!-- Remote volume group -->

    <PreferenceCategory
@@ -90,51 +89,52 @@ 
        android:order="-140"

        settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>



    <!-- Also vibrate for calls -->

    <Preference

        android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"

        android:key="vibrate_for_calls"

        android:title="@string/vibrate_when_ringing_title"

        android:order="-130"

        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"

        settings:keywords="@string/keywords_vibrate_for_calls"/>



    <!-- TODO(b/174964721): make this a PrimarySwitchPreference -->

    <!-- Interruptions -->

    <com.android.settingslib.RestrictedPreference

        android:key="zen_mode"

        android:title="@string/zen_mode_settings_title"

        android:fragment="com.android.settings.notification.zen.ZenModeSettings"

        android:order="-120"

        android:order="-130"

        settings:useAdminDisabledSummary="true"

        settings:keywords="@string/keywords_sounds_and_notifications_interruptions"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>



    <!-- Phone ringtone -->

    <com.android.settings.DefaultRingtonePreference

        android:key="phone_ringtone"

        android:title="@string/ringtone_title"

        android:dialogTitle="@string/ringtone_title"

        android:summary="@string/summary_placeholder"

        android:ringtoneType="ringtone"

        android:order="-120"

        settings:keywords="@string/sound_settings"/>



    <!-- Live Caption -110 and Now Playing -105-->

    <Preference

        android:key="media_controls_summary"

        android:title="@string/media_controls_title"

        android:fragment="com.android.settings.sound.MediaControlsSettings"

        android:order="-110"

        android:order="-100"

        settings:controller="com.android.settings.sound.MediaControlsParentPreferenceController"

        settings:keywords="@string/keywords_media_controls"/>



    <!-- Also vibrate for calls -->

    <Preference

        android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"

        android:key="vibrate_for_calls"

        android:title="@string/vibrate_when_ringing_title"

        android:order="-90"

        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"

        settings:keywords="@string/keywords_vibrate_for_calls"/>



    <com.android.settings.widget.PrimarySwitchPreference

        android:key="gesture_prevent_ringing_sound"

        android:title="@string/gesture_prevent_ringing_sound_title"

        android:order="-107"

        android:order="-80"

        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"

        settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController"/>



    <!-- Phone ringtone -->

    <com.android.settings.DefaultRingtonePreference

        android:key="phone_ringtone"

        android:title="@string/ringtone_title"

        android:dialogTitle="@string/ringtone_title"

        android:summary="@string/summary_placeholder"

        android:ringtoneType="ringtone"

        android:order="-100"

        settings:keywords="@string/sound_settings"/>



    <!-- Default notification ringtone -->

    <com.android.settings.DefaultRingtonePreference

        android:key="notification_ringtone"
@@ -142,7 +142,7 @@ 
        android:dialogTitle="@string/notification_ringtone_title"

        android:summary="@string/summary_placeholder"

        android:ringtoneType="notification"

        android:order="-90"/>

        android:order="-70"/>



    <!-- Default alarm ringtone -->

    <com.android.settings.DefaultRingtonePreference
@@ -152,100 +152,70 @@ 
        android:summary="@string/summary_placeholder"

        android:persistent="false"

        android:ringtoneType="alarm"

        android:order="-80"/>



    <!-- Other sounds -->

    <PreferenceCategory

          android:key="other_sounds_and_vibrations_category"

          android:title="@string/other_sound_category_preference_title"

          android:order="-50">

        android:order="-60"/>



    <!-- Dial pad tones -->

    <SwitchPreference

        android:key="dial_pad_tones"

          android:title="@string/dial_pad_tones_title"/>

        android:title="@string/dial_pad_tones_title"

        android:order="-50"/>



    <!-- Screen locking sounds -->

    <SwitchPreference

        android:key="screen_locking_sounds"

          android:title="@string/screen_locking_sounds_title"/>

        android:title="@string/screen_locking_sounds_title"

        android:order="-45"/>



    <!-- Charging sounds -->

    <SwitchPreference

        android:key="charging_sounds"

          android:title="@string/charging_sounds_title"/>

        android:title="@string/charging_sounds_title"

        android:order="-40"/>



    <!-- Docking sounds -->

    <SwitchPreference

        android:key="docking_sounds"

          android:title="@string/docking_sounds_title"/>

        android:title="@string/docking_sounds_title"

        android:order="-35"/>



    <!-- Touch sounds -->

    <SwitchPreference

        android:key="touch_sounds"

          android:title="@string/touch_sounds_title"/>

        android:title="@string/touch_sounds_title"

        android:order="-30"/>



    <!-- Vibrate on touch -->

    <SwitchPreference

        android:key="vibrate_on_touch"

        android:title="@string/vibrate_on_touch_title"

        android:summary="@string/vibrate_on_touch_summary"

          settings:keywords="@string/keywords_vibrate_on_touch"/>

        settings:keywords="@string/keywords_vibrate_on_touch"

        android:order="-25"/>



    <!-- Dock speaker plays -->

    <DropDownPreference

        android:key="dock_audio_media"

        android:title="@string/dock_audio_media_title"

          android:summary="%s"/>

        android:summary="%s"

        android:order="-20"/>



    <!-- Boot sounds -->

    <SwitchPreference

        android:key="boot_sounds"

          android:title="@string/boot_sounds_title"/>

        android:title="@string/boot_sounds_title"

        android:order="-15"/>



    <!-- Emergency tone -->

    <DropDownPreference

        android:key="emergency_tone"

        android:title="@string/emergency_tone_title"

          android:summary="%s"/>

    </PreferenceCategory>

        android:summary="%s"

        android:order="-10"/>



    <com.android.settings.widget.WorkOnlyCategory

        android:key="sound_work_settings_section"

    <Preference

        android:key="sound_work_settings"

        android:title="@string/sound_work_settings"

        android:order="100">



                <!-- Use the same sounds of the work profile -->

                <SwitchPreference

                    android:key="work_use_personal_sounds"

                    android:title="@string/work_use_personal_sounds_title"

                    android:summary="@string/work_use_personal_sounds_summary"

                    android:disableDependentsState="true"/>



                <!-- Work phone ringtone -->

                <com.android.settings.DefaultRingtonePreference

                    android:key="work_ringtone"

                    android:title="@string/work_ringtone_title"

                    android:dialogTitle="@string/work_alarm_ringtone_title"

                    android:ringtoneType="ringtone"

                    android:dependency="work_use_personal_sounds"/>



                <!-- Default work notification ringtone -->

                <com.android.settings.DefaultRingtonePreference

                    android:key="work_notification_ringtone"

                    android:title="@string/work_notification_ringtone_title"

                    android:dialogTitle="@string/work_alarm_ringtone_title"

                    android:ringtoneType="notification"

                    android:dependency="work_use_personal_sounds"/>



                <!-- Default work alarm ringtone -->

                <com.android.settings.DefaultRingtonePreference

                    android:key="work_alarm_ringtone"

                    android:title="@string/work_alarm_ringtone_title"

                    android:dialogTitle="@string/work_alarm_ringtone_title"

                    android:persistent="false"

                    android:ringtoneType="alarm"

                    android:dependency="work_use_personal_sounds"/>



    </com.android.settings.widget.WorkOnlyCategory>

        android:fragment="com.android.settings.notification.SoundWorkSettings"

        android:order="100"

        settings:controller="com.android.settings.notification.WorkSoundsPreferenceController"/>

</PreferenceScreen>

res/xml/sound_settings_v2.xml

deleted100644 → 0
+0 −221
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 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.

-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/sound_settings"

    android:key="sound_settings"

    settings:keywords="@string/keywords_sounds">



    <!-- Remote volume group -->

    <PreferenceCategory

        android:key="remote_media_group"

        android:title=""

        android:order="-185"

        settings:allowDividerBelow="true"

        settings:controller="com.android.settings.notification.RemoteVolumeGroupController">

    </PreferenceCategory>



    <!-- Media volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="media_volume"

        android:icon="@drawable/ic_media_stream"

        android:title="@string/media_volume_option_title"

        android:order="-180"

        settings:controller="com.android.settings.notification.MediaVolumePreferenceController"/>



    <!-- Media output switcher -->

    <Preference

        android:key="media_output"

        android:title="@string/media_output_title"

        android:dialogTitle="@string/media_output_title"

        android:order="-175"

        settings:searchable="false"

        settings:controller="com.android.settings.sound.MediaOutputPreferenceController"/>



    <!-- Call volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="call_volume"

        android:icon="@drawable/ic_local_phone_24_lib"

        android:title="@string/call_volume_option_title"

        android:order="-170"

        settings:controller="com.android.settings.notification.CallVolumePreferenceController"/>



    <!-- Hands free profile output switcher -->

    <ListPreference

        android:key="take_call_on_output"

        android:title="@string/take_call_on_title"

        android:dialogTitle="@string/take_call_on_title"

        android:order="-165"

        settings:searchable="false"

        settings:controller="com.android.settings.sound.HandsFreeProfileOutputPreferenceController"/>



    <!-- Ring volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="ring_volume"

        android:icon="@drawable/ic_notifications"

        android:title="@string/ring_volume_option_title"

        android:order="-160"

        settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>





    <!-- Alarm volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="alarm_volume"

        android:icon="@*android:drawable/ic_audio_alarm"

        android:title="@string/alarm_volume_option_title"

        android:order="-150"

        settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>



    <!-- Notification volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="notification_volume"

        android:icon="@drawable/ic_notifications"

        android:title="@string/notification_volume_option_title"

        android:order="-140"

        settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>



    <!-- TODO(b/174964721): make this a PrimarySwitchPreference -->

    <!-- Interruptions -->

    <com.android.settingslib.RestrictedPreference

        android:key="zen_mode"

        android:title="@string/zen_mode_settings_title"

        android:fragment="com.android.settings.notification.zen.ZenModeSettings"

        android:order="-130"

        settings:useAdminDisabledSummary="true"

        settings:keywords="@string/keywords_sounds_and_notifications_interruptions"

        settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>



    <!-- Phone ringtone -->

    <com.android.settings.DefaultRingtonePreference

        android:key="phone_ringtone"

        android:title="@string/ringtone_title"

        android:dialogTitle="@string/ringtone_title"

        android:summary="@string/summary_placeholder"

        android:ringtoneType="ringtone"

        android:order="-120"

        settings:keywords="@string/sound_settings"/>



    <!-- Live Caption -110 and Now Playing -105-->

    <Preference

        android:key="media_controls_summary"

        android:title="@string/media_controls_title"

        android:fragment="com.android.settings.sound.MediaControlsSettings"

        android:order="-100"

        settings:controller="com.android.settings.sound.MediaControlsParentPreferenceController"

        settings:keywords="@string/keywords_media_controls"/>



    <!-- Also vibrate for calls -->

    <Preference

        android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"

        android:key="vibrate_for_calls"

        android:title="@string/vibrate_when_ringing_title"

        android:order="-90"

        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"

        settings:keywords="@string/keywords_vibrate_for_calls"/>



    <com.android.settings.widget.PrimarySwitchPreference

        android:key="gesture_prevent_ringing_sound"

        android:title="@string/gesture_prevent_ringing_sound_title"

        android:order="-80"

        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"

        settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController"/>



    <!-- Default notification ringtone -->

    <com.android.settings.DefaultRingtonePreference

        android:key="notification_ringtone"

        android:title="@string/notification_ringtone_title"

        android:dialogTitle="@string/notification_ringtone_title"

        android:summary="@string/summary_placeholder"

        android:ringtoneType="notification"

        android:order="-70"/>



    <!-- Default alarm ringtone -->

    <com.android.settings.DefaultRingtonePreference

        android:key="alarm_ringtone"

        android:title="@string/alarm_ringtone_title"

        android:dialogTitle="@string/alarm_ringtone_title"

        android:summary="@string/summary_placeholder"

        android:persistent="false"

        android:ringtoneType="alarm"

        android:order="-60"/>



    <!-- Dial pad tones -->

    <SwitchPreference

        android:key="dial_pad_tones"

        android:title="@string/dial_pad_tones_title"

        android:order="-50"/>



    <!-- Screen locking sounds -->

    <SwitchPreference

        android:key="screen_locking_sounds"

        android:title="@string/screen_locking_sounds_title"

        android:order="-45"/>



    <!-- Charging sounds -->

    <SwitchPreference

        android:key="charging_sounds"

        android:title="@string/charging_sounds_title"

        android:order="-40"/>



    <!-- Docking sounds -->

    <SwitchPreference

        android:key="docking_sounds"

        android:title="@string/docking_sounds_title"

        android:order="-35"/>



    <!-- Touch sounds -->

    <SwitchPreference

        android:key="touch_sounds"

        android:title="@string/touch_sounds_title"

        android:order="-30"/>



    <!-- Vibrate on touch -->

    <SwitchPreference

        android:key="vibrate_on_touch"

        android:title="@string/vibrate_on_touch_title"

        android:summary="@string/vibrate_on_touch_summary"

        settings:keywords="@string/keywords_vibrate_on_touch"

        android:order="-25"/>



    <!-- Dock speaker plays -->

    <DropDownPreference

        android:key="dock_audio_media"

        android:title="@string/dock_audio_media_title"

        android:summary="%s"

        android:order="-20"/>



    <!-- Boot sounds -->

    <SwitchPreference

        android:key="boot_sounds"

        android:title="@string/boot_sounds_title"

        android:order="-15"/>



    <!-- Emergency tone -->

    <DropDownPreference

        android:key="emergency_tone"

        android:title="@string/emergency_tone_title"

        android:summary="%s"

        android:order="-10"/>



    <Preference

        android:key="sound_work_settings"

        android:title="@string/sound_work_settings"

        android:fragment="com.android.settings.notification.SoundWorkSettings"

        android:order="100"

        settings:controller="com.android.settings.notification.WorkSoundsPreferenceController"/>

</PreferenceScreen>

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

+0 −34
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.UserHandle;

import android.preference.SeekBarVolumizer;

import android.provider.SearchIndexableResource;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;



import androidx.annotation.VisibleForTesting;

import androidx.preference.ListPreference;
@@ -35,7 +33,6 @@ import androidx.preference.Preference; 


import com.android.settings.R;

import com.android.settings.RingtonePreference;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.OnActivityResultListener;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -155,9 +152,6 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult 


    @Override

    protected int getPreferenceScreenResId() {

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {

            return R.xml.sound_settings_v2;

        }

        return R.xml.sound_settings;

    }
@@ -251,12 +245,6 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult 
        controllers.add(new AlarmRingtonePreferenceController(context));

        controllers.add(new NotificationRingtonePreferenceController(context));



        if (!FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)) {

            // TODO(b/174964721): This should be removed when the flag is deprecated.

            // === Work Sound Settings ===

            controllers.add(new WorkSoundPreferenceController(context, fragment, lifecycle));

        }



        // === Other Sound Settings ===

        final DialPadTonePreferenceController dialPadTonePreferenceController =

                new DialPadTonePreferenceController(context, fragment, lifecycle);
@@ -312,30 +300,8 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult 
                    return buildPreferenceControllers(context, null /* fragment */,

                            null /* lifecycle */);

                }



                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)

                            ? R.xml.sound_settings_v2 : R.xml.sound_settings;

                    return Arrays.asList(sir);

                }

            };



    // === Work Sound Settings ===



    void enableWorkSync() {

        // TODO(b/174964721): This should be refined when the flag is deprecated.

        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {

            final WorkSoundPreferenceController workSoundController =

                    use(WorkSoundPreferenceController.class);

            if (workSoundController != null) {

                workSoundController.enableWorkSync();

            }

        }

    }



    private void onPreferenceDataChanged(ListPreference preference) {

        if (mDialogFragment != null) {

            mDialogFragment.onListPreferenceUpdated(preference);

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

+1 −7
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.os.UserManager;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;



import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.RingtonePreference;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.OnActivityResultListener;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -123,16 +121,12 @@ public class SoundWorkSettings extends DashboardFragment implements OnActivityRe 
    }



    static final boolean isSupportWorkProfileSound(Context context) {

        // TODO(b/174964721): Feature flag should be removed when silky home launched.

        final boolean isSilkyEnabled = FeatureFlagUtils.isEnabled(context,

                FeatureFlags.SILKY_HOME);



        final AudioHelper audioHelper = new AudioHelper(context);

        final boolean hasWorkProfile = audioHelper.getManagedProfileId(

                UserManager.get(context)) != UserHandle.USER_NULL;

        final boolean shouldShowRingtoneSettings = !audioHelper.isSingleVolume();



        return isSilkyEnabled && hasWorkProfile && shouldShowRingtoneSettings;

        return hasWorkProfile && shouldShowRingtoneSettings;

    }



    void enableWorkSync() {

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

deleted100644 → 0
+0 −368

File deleted.

Preview size limit exceeded, changes collapsed.