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

Merge "Establish permanently unavailable settings"

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-09 18:14:32 +00:00
committed by Android (Google) Code Review
parent c0e0262f9c f87a1f3f41
commit 02ec86a17b
113 changed files with 185 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/AlarmVolumePreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.notification;
import android.content.Context;
import android.media.AudioManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
public class AlarmVolumePreferenceController extends
@@ -34,7 +33,7 @@ public class AlarmVolumePreferenceController extends
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_alarm_volume)
&& !mHelper.isSingleVolume() ? AVAILABLE : DISABLED_UNSUPPORTED;
&& !mHelper.isSingleVolume() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override

2
src/com/android/settings/notification/BadgingNotificationPreferenceController.java
View File

@@ -85,7 +85,7 @@ public class BadgingNotificationPreferenceController extends TogglePreferenceCon
public int getAvailabilityStatus() {
return mContext.getResources()
.getBoolean(com.android.internal.R.bool.config_notificationBadging)
? AVAILABLE : DISABLED_UNSUPPORTED;
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override

5
src/com/android/settings/notification/MediaVolumePreferenceController.java
View File

@@ -18,9 +18,8 @@ package com.android.settings.notification;
import android.content.Context;
import android.media.AudioManager;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class MediaVolumePreferenceController extends
VolumeSeekBarPreferenceController {
@@ -35,7 +34,7 @@ public class MediaVolumePreferenceController extends
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_media_volume)
? AVAILABLE
: DISABLED_UNSUPPORTED;
: UNSUPPORTED_ON_DEVICE;
}
@Override

3
src/com/android/settings/notification/NotificationVolumePreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.notification;
import android.content.Context;
import android.media.AudioManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -36,7 +35,7 @@ public class NotificationVolumePreferenceController extends
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_notification_volume)
&& !Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
? AVAILABLE : DISABLED_UNSUPPORTED;
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override

2
src/com/android/settings/notification/PulseNotificationPreferenceController.java
View File

@@ -71,7 +71,7 @@ public class PulseNotificationPreferenceController extends TogglePreferenceContr
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_intrusiveNotificationLed) ? AVAILABLE
: DISABLED_UNSUPPORTED;
: UNSUPPORTED_ON_DEVICE;
}
@Override

3
src/com/android/settings/notification/RingVolumePreferenceController.java
View File

@@ -30,7 +30,6 @@ import android.os.Looper;
import android.os.Message;
import android.os.Vibrator;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -85,7 +84,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
@Override
public int getAvailabilityStatus() {
return Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
? AVAILABLE : DISABLED_UNSUPPORTED;
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override