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

5
src/com/android/settings/display/AlwaysOnDisplaySlice.java
View File

@@ -106,4 +106,9 @@ public class AlwaysOnDisplaySlice implements CustomSliceable {
public Intent getIntent() {
return null;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
}

5
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
View File

@@ -67,6 +67,11 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public boolean isChecked() {
return getConfig().alwaysOnEnabled(MY_USER);

6
src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
View File

@@ -25,6 +25,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -100,4 +101,9 @@ public class AmbientDisplayNotificationsPreferenceController extends
return mConfig;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
}

5
src/com/android/settings/display/AutoBrightnessPreferenceController.java
View File

@@ -61,4 +61,9 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
? R.string.auto_brightness_summary_on
: R.string.auto_brightness_summary_off);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
}

6
src/com/android/settings/display/AutoRotatePreferenceController.java
View File

@@ -20,6 +20,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.view.RotationPolicy;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
@@ -86,6 +87,11 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public boolean isChecked() {
return !RotationPolicy.isRotationLocked(mContext);

5
src/com/android/settings/display/ControlsPrivacyPreferenceController.java
View File

@@ -70,6 +70,11 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl
refreshSummary(preference);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
private boolean isEnabled() {
return isControlsAvailable();
}

5
src/com/android/settings/display/DarkUIPreferenceController.java
View File

@@ -95,6 +95,11 @@ public class DarkUIPreferenceController extends TogglePreferenceController imple
return mUiModeManager.setNightModeActivated(isChecked);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
private void showDarkModeDialog() {
final DarkUIInfoDialogFragment frag = new DarkUIInfoDialogFragment();
if (mFragment != null && mFragment.getFragmentManager() != null) {

11
src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
View File

@@ -21,19 +21,19 @@ import android.hardware.display.ColorDisplayManager;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
import android.provider.Settings.Secure;
import android.provider.Settings.System;
import androidx.annotation.VisibleForTesting;
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.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settings.core.TogglePreferenceController;
public class DisplayWhiteBalancePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop {
@@ -62,6 +62,11 @@ public class DisplayWhiteBalancePreferenceController extends TogglePreferenceCon
return getColorDisplayManager().setDisplayWhiteBalanceEnabled(isChecked);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public void onStart() {
if (!isAvailable()) {

6
src/com/android/settings/display/NightDisplayActivationPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.widget.Switch;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -65,6 +66,11 @@ public class NightDisplayActivationPreferenceController extends
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);

6
src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
View File

@@ -23,6 +23,7 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
@@ -55,6 +56,11 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);

5
src/com/android/settings/display/NightDisplayPreferenceController.java
View File

@@ -95,6 +95,11 @@ public class NightDisplayPreferenceController extends TogglePreferenceController
preference.setSummary(mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager));
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public void onActivated(boolean activated) {
updateState(mPreference);

5
src/com/android/settings/display/PeakRefreshRatePreferenceController.java
View File

@@ -119,6 +119,11 @@ public class PeakRefreshRatePreferenceController extends TogglePreferenceControl
mContext.getContentResolver(), Settings.System.PEAK_REFRESH_RATE, peakRefreshRate);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public void onStart() {
mDeviceConfigDisplaySettings.startListening();

6
src/com/android/settings/display/SmartAutoRotateController.java
View File

@@ -43,6 +43,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.view.RotationPolicy;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -157,6 +158,11 @@ public class SmartAutoRotateController extends TogglePreferenceController implem
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
static boolean isRotationResolverServiceAvailable(Context context) {
final PackageManager packageManager = context.getPackageManager();
final String resolvePackage = packageManager.getRotationResolverPackageName();

7
src/com/android/settings/display/SmartAutoRotatePreferenceController.java
View File

@@ -22,7 +22,6 @@ import static android.provider.Settings.Secure.CAMERA_AUTOROTATE;
import static com.android.settings.display.SmartAutoRotateController.hasSufficientPermission;
import static com.android.settings.display.SmartAutoRotateController.isRotationResolverServiceAvailable;
import android.text.TextUtils;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -32,6 +31,7 @@ import android.hardware.SensorPrivacyManager;
import android.os.PowerManager;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -90,6 +90,11 @@ public class SmartAutoRotatePreferenceController extends TogglePreferenceControl
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);

5
src/com/android/settings/display/WalletPrivacyPreferenceController.java
View File

@@ -72,6 +72,11 @@ public class WalletPrivacyPreferenceController extends TogglePreferenceControlle
refreshSummary(preference);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
private boolean isEnabled() {
return mClient.isWalletServiceAvailable();
}