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

Merge "Add Volume panel"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-03 21:09:47 +00:00
committed by Android (Google) Code Review
parent 859017e99a c999b088d2
commit 48608219f3
12 changed files with 197 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import android.content.ContentResolver;
import android.net.Uri;
import android.provider.SettingsSlicesContract;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
@@ -147,6 +148,43 @@ public class CustomSliceRegistry {
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath("storage_card")
.build();
/**
* Full {@link Uri} for the Alarm volume Slice.
*/
public static final Uri VOLUME_ALARM_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("alarm_volume")
.build();
/**
* Full {@link Uri} for the Call Volume Slice.
*/
public static final Uri VOLUME_CALL_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("call_volume")
.build();
/**
* Full {@link Uri} for the Media Volume Slice.
*/
public static final Uri VOLUME_MEDIA_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("media_volume")
.build();
/**
* Full {@link Uri} for the Ringer volume Slice.
*/
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 Wifi Calling Slice.
*/

5
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -193,8 +193,9 @@ public class SliceBuilderUtils {
CharSequence summaryText = controller.getSummary();
// Priority 1 : User prefers showing the dynamic summary in slice view rather than static
// summary.
if (isDynamicSummaryAllowed && isValidSummary(context, summaryText)) {
// summary. Note it doesn't require a valid summary - so we can force some slices to have
// empty summaries (ex: volume).
if (isDynamicSummaryAllowed) {
return summaryText;
}