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

Commit dd56cea6 authored by Behnam Heydarshahi's avatar Behnam Heydarshahi Committed by Android (Google) Code Review
Browse files

Merge "Remove ring_volume from VolumePanel" into main

parents 92219f0d b443557d

src/com/android/settings/panel/VolumePanel.java

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.android.settings.slices.CustomSliceRegistry.VOLUME_ALARM_URI; 
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_CALL_URI;

import static com.android.settings.slices.CustomSliceRegistry.VOLUME_MEDIA_URI;

import static com.android.settings.slices.CustomSliceRegistry.VOLUME_NOTIFICATION_URI;

import static com.android.settings.slices.CustomSliceRegistry.VOLUME_RINGER_URI;

import static com.android.settings.slices.CustomSliceRegistry.VOLUME_SEPARATE_RING_URI;



import android.app.Activity;
@@ -144,7 +143,6 @@ public class VolumePanel implements PanelContent, LifecycleObserver { 
        }

        uris.add(MEDIA_OUTPUT_INDICATOR_SLICE_URI);

        uris.add(VOLUME_CALL_URI);

        uris.add(VOLUME_RINGER_URI);

        uris.add(VOLUME_SEPARATE_RING_URI);

        uris.add(VOLUME_NOTIFICATION_URI);

        uris.add(VOLUME_ALARM_URI);

src/com/android/settings/slices/CustomSliceRegistry.java

+0 −10
Original line number Diff line number Diff line
@@ -195,16 +195,6 @@ public class CustomSliceRegistry { 
            .appendPath("media_volume")

            .build();



    /**

     * Full {@link Uri} for the Ringer volume Slice. (Ring & notification combined)

     */

    public static final Uri VOLUME_RINGER_URI = new Uri.Builder()

            .scheme(ContentResolver.SCHEME_CONTENT)

            .authority(SettingsSliceProvider.SLICE_AUTHORITY)

            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)

            .appendPath("ring_volume")

            .build();



    /**

     * Full {@link Uri} for the Separate Ring volume Slice.

     */

tests/robotests/src/com/android/settings/panel/VolumePanelTest.java

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class VolumePanelTest { 
                CustomSliceRegistry.VOLUME_CALL_URI,

                CustomSliceRegistry.VOLUME_MEDIA_URI,

                CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI,

                CustomSliceRegistry.VOLUME_RINGER_URI,

                CustomSliceRegistry.VOLUME_SEPARATE_RING_URI,

                CustomSliceRegistry.VOLUME_NOTIFICATION_URI,

                CustomSliceRegistry.VOLUME_ALARM_URI);