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

Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 am: 93ae531273

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Ifc2e24c703199737d647f55f8615d83795630477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Behnam Heydarshahi
2023-01-12 17:18:05 +00:00
committed by Automerger Merge Worker
parent f1ad9691f2 93ae531273
commit 74f725254e
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Set;
@@ -129,8 +128,7 @@ public class NotificationVolumePreferenceController extends
boolean separateNotification = isSeparateNotificationConfigEnabled();
return mContext.getResources().getBoolean(R.bool.config_show_notification_volume)
&& !mHelper.isSingleVolume()
&& (separateNotification || !Utils.isVoiceCapable(mContext))
&& !mHelper.isSingleVolume() && separateNotification
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}

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

@@ -34,7 +34,6 @@ import androidx.lifecycle.OnLifecycleEvent;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Set;
@@ -114,8 +113,7 @@ public class RingVolumePreferenceController extends
@Override
public int getAvailabilityStatus() {
boolean separateNotification = isSeparateNotificationConfigEnabled();
return !separateNotification && Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
return !separateNotification && !mHelper.isSingleVolume()
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}

4
src/com/android/settings/notification/SeparateRingVolumePreferenceController.java
View File

@@ -33,7 +33,6 @@ import androidx.lifecycle.OnLifecycleEvent;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Set;
@@ -111,8 +110,7 @@ public class SeparateRingVolumePreferenceController extends
@Override
public int getAvailabilityStatus() {
boolean separateNotification = isSeparateNotificationConfigEnabled();
return separateNotification && Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
return separateNotification && !mHelper.isSingleVolume()
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}