Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Move blur toggle to Display options.

Browse Source 
Change-Id: I64cadfd69c66a30ada9f5ba5509dd97a85124326
This commit is contained in:
Jyotiraditya
2020-10-09 10:39:59 +05:30
committed by Joey
parent 89352269a5
commit 76f9545826
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/development_settings.xml
View File

@@ -625,10 +625,6 @@
android:title="@string/hwui_force_dark_title"
android:summary="@string/hwui_force_dark_summary" />
<SwitchPreferenceCompat
android:key="enable_blurs_on_windows"
android:title="@string/window_blurs"/>
<SwitchPreferenceCompat
android:key="force_msaa"
android:title="@string/force_msaa"

4
res/xml/display_settings.xml
View File

@@ -218,6 +218,10 @@
android:key="lift_to_wake"
android:title="@string/lift_to_wake_title"/>
<SwitchPreferenceCompat
android:key="enable_blurs_on_windows"
android:title="@string/window_blurs"/>
<SwitchPreferenceCompat
android:key="tap_to_wake"
android:title="@string/tap_to_wake"

2
src/com/android/settings/DisplaySettings.java
View File

@@ -30,6 +30,7 @@ import com.android.settings.display.DisplayScreen;
import com.android.settings.display.LiftToWakePreferenceController;
import com.android.settings.display.ShowOperatorNamePreferenceController;
import com.android.settings.display.TapToWakePreferenceController;
import com.android.settings.display.EnableBlursPreferenceController;
import com.android.settings.display.ThemePreferenceController;
import com.android.settings.display.VrDisplayPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -86,6 +87,7 @@ public class DisplaySettings extends DashboardFragment {
controllers.add(new CameraGesturePreferenceController(context));
controllers.add(new LiftToWakePreferenceController(context));
controllers.add(new TapToWakePreferenceController(context));
controllers.add(new EnableBlursPreferenceController(context));
controllers.add(new VrDisplayPreferenceController(context));
controllers.add(new ShowOperatorNamePreferenceController(context));
controllers.add(new ThemePreferenceController(context));

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -795,7 +795,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new DebugNonRectClipOperationsPreferenceController(context));
controllers.add(new GameDefaultFrameRatePreferenceController(context));
controllers.add(new ForceDarkPreferenceController(context));
controllers.add(new EnableBlursPreferenceController(context));
controllers.add(new ForceMSAAPreferenceController(context));
controllers.add(new HardwareOverlaysPreferenceController(context));
controllers.add(new SimulateColorSpacePreferenceController(context));

16
src/com/android/settings/development/EnableBlursPreferenceController.java → src/com/android/settings/display/EnableBlursPreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.development;
package com.android.settings.display;
import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
@@ -26,12 +26,12 @@ import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
/**
* Controller that toggles window blurs on devices that support it.
*/
public final class EnableBlursPreferenceController extends DeveloperOptionsPreferenceController
public final class EnableBlursPreferenceController extends AbstractPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String ENABLE_BLURS_ON_WINDOWS = "enable_blurs_on_windows";
@@ -69,14 +69,6 @@ public final class EnableBlursPreferenceController extends DeveloperOptionsPrefe
public void updateState(Preference preference) {
boolean isEnabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DISABLE_WINDOW_BLURS, 0) == 0;
((TwoStatePreference) mPreference).setChecked(isEnabled);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DISABLE_WINDOW_BLURS, 0);
updateState(null);
((TwoStatePreference) preference).setChecked(isEnabled);
}
}