PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ring_volume from VolumePanel" into main

Browse Source
This commit is contained in:
Behnam Heydarshahi
2023-10-30 20:43:47 +00:00
committed by Android (Google) Code Review
parent 92219f0d37 b443557d3d
commit dd56cea63b
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/panel/VolumePanel.java
View File

@@ -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_CALL_URI;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_MEDIA_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_NOTIFICATION_URI;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_RINGER_URI;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_SEPARATE_RING_URI; import static com.android.settings.slices.CustomSliceRegistry.VOLUME_SEPARATE_RING_URI;
import android.app.Activity; import android.app.Activity;
@@ -144,7 +143,6 @@ public class VolumePanel implements PanelContent, LifecycleObserver {
} }
uris.add(MEDIA_OUTPUT_INDICATOR_SLICE_URI); uris.add(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
uris.add(VOLUME_CALL_URI); uris.add(VOLUME_CALL_URI);
uris.add(VOLUME_RINGER_URI);
uris.add(VOLUME_SEPARATE_RING_URI); uris.add(VOLUME_SEPARATE_RING_URI);
uris.add(VOLUME_NOTIFICATION_URI); uris.add(VOLUME_NOTIFICATION_URI);
uris.add(VOLUME_ALARM_URI); uris.add(VOLUME_ALARM_URI);

10
src/com/android/settings/slices/CustomSliceRegistry.java
View File

@@ -195,16 +195,6 @@ public class CustomSliceRegistry {
.appendPath("media_volume") .appendPath("media_volume")
.build(); .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. * Full {@link Uri} for the Separate Ring volume Slice.
*/ */

1
tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
View File

@@ -62,7 +62,6 @@ public class VolumePanelTest {
CustomSliceRegistry.VOLUME_CALL_URI, CustomSliceRegistry.VOLUME_CALL_URI,
CustomSliceRegistry.VOLUME_MEDIA_URI, CustomSliceRegistry.VOLUME_MEDIA_URI,
CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI, CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI,
CustomSliceRegistry.VOLUME_RINGER_URI,
CustomSliceRegistry.VOLUME_SEPARATE_RING_URI, CustomSliceRegistry.VOLUME_SEPARATE_RING_URI,
CustomSliceRegistry.VOLUME_NOTIFICATION_URI, CustomSliceRegistry.VOLUME_NOTIFICATION_URI,
CustomSliceRegistry.VOLUME_ALARM_URI); CustomSliceRegistry.VOLUME_ALARM_URI);