Convert xml based API allowDynamicSummaryInSlice to java
- Add boolean useDynamicSliceSummary() in Sliceable interface. This is the switch equivalent to android:allowDynamicSummaryInSlice in xml. It moves the setter closer to regular Sliceable APIs, thus less easily to miss. - Coverted all android:allowDynamicSummaryInSlice to use the java API. - Except 2 prefs in my_device_info. They incorrectly set this to true previously (controller is not sliceable, no point setting dynamicSliceSummary to true. They just won't do anything) Fixes: 128446156 Test: robolectric Change-Id: Ic57acd590dec3e87dcf4592df137321d14b854d9
This commit is contained in:
@@ -26,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.accounts.AccountRestrictionHelper;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.core.SliderPreferenceController;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
@@ -35,7 +34,7 @@ import com.android.settingslib.RestrictedPreference;
|
||||
* restriction
|
||||
*/
|
||||
public abstract class AdjustVolumeRestrictedPreferenceController extends
|
||||
SliderPreferenceController implements PreferenceControllerMixin {
|
||||
SliderPreferenceController {
|
||||
|
||||
private AccountRestrictionHelper mHelper;
|
||||
|
||||
|
||||
@@ -22,8 +22,7 @@ import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
public class AlarmVolumePreferenceController extends
|
||||
VolumeSeekBarPreferenceController {
|
||||
public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceController {
|
||||
|
||||
private static final String KEY_ALARM_VOLUME = "alarm_volume";
|
||||
|
||||
@@ -42,6 +41,11 @@ public class AlarmVolumePreferenceController extends
|
||||
return TextUtils.equals(getPreferenceKey(), "alarm_volume");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean useDynamicSliceSummary() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_ALARM_VOLUME;
|
||||
|
||||
@@ -43,6 +43,11 @@ public class CallVolumePreferenceController extends VolumeSeekBarPreferenceContr
|
||||
return TextUtils.equals(getPreferenceKey(), "call_volume");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean useDynamicSliceSummary() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAudioStream() {
|
||||
if (mAudioManager.isBluetoothScoOn()) {
|
||||
|
||||
@@ -22,8 +22,7 @@ import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
public class MediaVolumePreferenceController extends
|
||||
VolumeSeekBarPreferenceController {
|
||||
public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceController {
|
||||
|
||||
private static final String KEY_MEDIA_VOLUME = "media_volume";
|
||||
|
||||
@@ -43,6 +42,11 @@ public class MediaVolumePreferenceController extends
|
||||
return TextUtils.equals(getPreferenceKey(), KEY_MEDIA_VOLUME);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean useDynamicSliceSummary() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_MEDIA_VOLUME;
|
||||
|
||||
@@ -37,8 +37,7 @@ import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class RemoteVolumePreferenceController extends
|
||||
VolumeSeekBarPreferenceController {
|
||||
public class RemoteVolumePreferenceController extends VolumeSeekBarPreferenceController {
|
||||
|
||||
private static final String KEY_REMOTE_VOLUME = "remote_volume";
|
||||
@VisibleForTesting
|
||||
@@ -167,6 +166,11 @@ public class RemoteVolumePreferenceController extends
|
||||
return TextUtils.equals(getPreferenceKey(), KEY_REMOTE_VOLUME);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean useDynamicSliceSummary() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_REMOTE_VOLUME;
|
||||
|
||||
@@ -95,6 +95,11 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
|
||||
return TextUtils.equals(getPreferenceKey(), KEY_RING_VOLUME);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean useDynamicSliceSummary() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAudioStream() {
|
||||
return AudioManager.STREAM_RING;
|
||||
|
||||
Reference in New Issue
Block a user