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

Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6

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

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
This commit is contained in:
Jason Chiu
2021-11-02 02:43:42 +00:00
committed by Automerger Merge Worker
parent ae5f30b15a 026b1b5df6
commit 7f6b9e26c9
124 changed files with 760 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -87,6 +88,11 @@ public class BadgingNotificationPreferenceController extends TogglePreferenceCon
return TextUtils.equals(getPreferenceKey(), "notification_badging");
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
@Override
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(),

6
src/com/android/settings/notification/BubbleNotificationPreferenceController.java
View File

@@ -88,6 +88,12 @@ public class BubbleNotificationPreferenceController extends
return false;
}
@Override
public int getSliceHighlightMenuRes() {
// not needed since it's not sliceable
return 0;
}
@Override
public boolean isChecked() {
return Settings.Global.getInt(mContext.getContentResolver(),

6
src/com/android/settings/notification/NotificationAssistantPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.provider.Settings;
import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
@@ -73,6 +74,11 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC
}
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
protected void setNotificationAssistantGranted(ComponentName cn) {
if (Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, mUserId) == 0) {

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

@@ -28,6 +28,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -86,6 +87,11 @@ public class PulseNotificationPreferenceController extends TogglePreferenceContr
isChecked ? ON : OFF);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
class SettingObserver extends ContentObserver {
private final Uri NOTIFICATION_LIGHT_PULSE_URI =

6
src/com/android/settings/notification/RedactNotificationPreferenceController.java
View File

@@ -32,6 +32,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
@@ -146,6 +147,11 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont
return AVAILABLE;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
@Override
public void onStart() {
mContext.getContentResolver().registerContentObserver(

6
src/com/android/settings/notification/SilentStatusBarPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.notification;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
@@ -52,4 +53,9 @@ public class SilentStatusBarPreferenceController extends TogglePreferenceControl
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
}

10
src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
View File

@@ -21,10 +21,11 @@ import static android.provider.Settings.Secure.SHOW_NOTIFICATION_SNOOZE;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class SnoozeNotificationPreferenceController extends TogglePreferenceController {
private static final String TAG = "SnoozeNotifPrefContr";
@@ -53,4 +54,9 @@ public class SnoozeNotificationPreferenceController extends TogglePreferenceCont
return Settings.Secure.putInt(mContext.getContentResolver(),
SHOW_NOTIFICATION_SNOOZE, isChecked ? ON : OFF);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
}

6
src/com/android/settings/notification/SpatialAudioPreferenceController.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.media.AudioManager;
import android.media.Spatializer;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -53,4 +54,9 @@ public class SpatialAudioPreferenceController extends TogglePreferenceController
mSpatializer.setEnabled(isChecked);
return isChecked == isChecked();
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_notifications;
}
}

6
src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
View File

@@ -23,6 +23,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -75,6 +76,11 @@ public abstract class VolumeSeekBarPreferenceController extends
}
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_sound;
}
@Override
public int getSliderPosition() {
if (mPreference != null) {

2
src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
View File

@@ -120,7 +120,7 @@ public class ZenModeSliceBuilder {
final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString();
return SliceBuilderUtils.buildSearchResultPageIntent(context,
ZenModeSettings.class.getName(), ZEN_MODE_SLICE_KEY, screenTitle,
SettingsEnums.NOTIFICATION_ZEN_MODE)
SettingsEnums.NOTIFICATION_ZEN_MODE, R.string.menu_key_notifications)
.setClassName(context.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}