diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 2aa1a6ea7798..9407acc56f97 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6149,6 +6149,10 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
*/
public static final String QQS_LAYOUT = "qqs_layout";
+ /**
+ * @hide
+ */
+ public static final String QS_UI_STYLE = "qs_ui_style";
/**
* Whether to enable PULSE Edge lights
* @hide
diff --git a/core/java/com/android/internal/util/octavi/OctaviUtils.java b/core/java/com/android/internal/util/octavi/OctaviUtils.java
index dd8a2d4e2cdf..2c8f04072e0e 100644
--- a/core/java/com/android/internal/util/octavi/OctaviUtils.java
+++ b/core/java/com/android/internal/util/octavi/OctaviUtils.java
@@ -240,6 +240,12 @@ public static boolean getQSTileVerticalLayout(Context context) {
0, UserHandle.USER_CURRENT) == 1;
}
+ public static int getQsUiStyle(Context context) {
+ return Settings.System.getIntForUser(context.getContentResolver(),
+ Settings.System.QS_UI_STYLE,
+ 0, UserHandle.USER_CURRENT);
+ }
+
public static boolean updateLayout(Context context) {
final IOverlayManager overlayManager = IOverlayManager.Stub.asInterface(ServiceManager.getService(
Context.OVERLAY_SERVICE));
diff --git a/packages/SettingsLib/src/com/android/settingslib/display/BrightnessUtils.java b/packages/SettingsLib/src/com/android/settingslib/display/BrightnessUtils.java
index 4f86afaa995c..e108ceedea03 100644
--- a/packages/SettingsLib/src/com/android/settingslib/display/BrightnessUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/display/BrightnessUtils.java
@@ -16,12 +16,18 @@
package com.android.settingslib.display;
+import android.os.SystemProperties;
import android.util.MathUtils;
+import com.android.internal.display.BrightnessSynchronizer;
+
public class BrightnessUtils {
+ public static final boolean sysUseLowGamma = Boolean.parseBoolean(
+ SystemProperties.get("persist.sys.brightness.low.gamma", "false"));
+
public static final int GAMMA_SPACE_MIN = 0;
- public static final int GAMMA_SPACE_MAX = 65535;
+ public static final int GAMMA_SPACE_MAX = sysUseLowGamma ? 255 : 65535;
// Hybrid Log Gamma constant values
private static final float R = 0.5f;
@@ -87,9 +93,8 @@ public static final float convertGammaToLinearFloat(int val, float min, float ma
// it shouldn't be out of bounds.
final float normalizedRet = MathUtils.constrain(ret, 0, 12);
- // Re-normalize to the range [0, 1]
- // in order to derive the correct setting value.
- return MathUtils.lerp(min, max, normalizedRet / 12);
+ return sysUseLowGamma ? MathUtils.constrain(BrightnessSynchronizer.brightnessIntToFloat(val),
+ min, max) : MathUtils.lerp(min, max, normalizedRet / 12);
}
/**
@@ -136,6 +141,7 @@ public static final int convertLinearToGammaFloat(float val, float min, float ma
ret = A * MathUtils.log(normalizedVal - B) + C;
}
- return Math.round(MathUtils.lerp(GAMMA_SPACE_MIN, GAMMA_SPACE_MAX, ret));
+ return sysUseLowGamma ? BrightnessSynchronizer.brightnessFloatToInt(
+ MathUtils.constrain(val, min, max)) : Math.round(MathUtils.lerp(GAMMA_SPACE_MIN, GAMMA_SPACE_MAX, ret));
}
-}
+}
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml b/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml
new file mode 100644
index 000000000000..7edc4c8531b8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml
@@ -0,0 +1,21 @@
+
+
+
+