mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-08-18 19:08:26 -04:00
Churn
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
717caac5c6
commit
c08ce75b03
13 changed files with 42 additions and 36 deletions
|
@ -10,7 +10,7 @@ requiring the READ_PHONE_STATE permission.
|
|||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
index f5103df80d6a..6c99d1050a9e 100644
|
||||
index a32aa6d895ef..fc3702c43607 100644
|
||||
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
||||
@@ -4479,12 +4479,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
|
|
|
@ -10,10 +10,10 @@ Change-Id: I0c87ddd9aec21fc610f3d17701192c04150308d7
|
|||
1 file changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
|
||||
index 6c8cab7783b6..73a98dcc56b3 100644
|
||||
index f7cd1c6d78eb..429c852b4ee7 100644
|
||||
--- a/cmds/bootanimation/BootAnimation.cpp
|
||||
+++ b/cmds/bootanimation/BootAnimation.cpp
|
||||
@@ -725,7 +725,7 @@ GLuint linkShader(GLuint vertexShader, GLuint fragmentShader) {
|
||||
@@ -742,7 +742,7 @@ GLuint linkShader(GLuint vertexShader, GLuint fragmentShader) {
|
||||
}
|
||||
|
||||
void BootAnimation::initShaders() {
|
||||
|
@ -22,7 +22,7 @@ index 6c8cab7783b6..73a98dcc56b3 100644
|
|||
GLuint vertexShader = compileShader(GL_VERTEX_SHADER, (const GLchar *)VERTEX_SHADER_SOURCE);
|
||||
GLuint imageFragmentShader =
|
||||
compileShader(GL_FRAGMENT_SHADER, dynamicColoringEnabled
|
||||
@@ -761,13 +761,7 @@ bool BootAnimation::threadLoop() {
|
||||
@@ -778,13 +778,7 @@ bool BootAnimation::threadLoop() {
|
||||
bool result;
|
||||
initShaders();
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ they get a message each time it tries again.
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
|
||||
index 07367aee8f5c..033bc8771e3c 100644
|
||||
index a7d55479d2c3..35af82fb39a2 100644
|
||||
--- a/core/res/res/values/config.xml
|
||||
+++ b/core/res/res/values/config.xml
|
||||
@@ -3597,7 +3597,7 @@
|
||||
|
|
|
@ -41,18 +41,18 @@ index d7cc36ff4ae2..72e6362c0a96 100644
|
|||
* Control whether to enable adaptive sleep mode.
|
||||
* @hide
|
||||
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
|
||||
index 482a70defb3f..02c1ab5f82f6 100644
|
||||
index 02632cb3fc17..ea97abd4c423 100644
|
||||
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
|
||||
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
|
||||
@@ -111,7 +111,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
private final SecureSettings mSecureSettings;
|
||||
@@ -117,7 +117,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
private final SystemSettings mSystemSettings;
|
||||
private final Executor mMainExecutor;
|
||||
private final Handler mBgHandler;
|
||||
- private final boolean mIsMonetEnabled;
|
||||
private final UserTracker mUserTracker;
|
||||
private final ConfigurationController mConfigurationController;
|
||||
private final DeviceProvisionedController mDeviceProvisionedController;
|
||||
@@ -250,7 +249,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -261,7 +260,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
final boolean hadWallpaperColors = mCurrentColors.get(userId) != null;
|
||||
int latestWallpaperType = getLatestWallpaperType(userId);
|
||||
if ((flags & latestWallpaperType) != 0) {
|
||||
|
@ -65,7 +65,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
if (DEBUG) Log.d(TAG, "got new colors: " + wallpaperColors + " where: " + flags);
|
||||
}
|
||||
|
||||
@@ -347,6 +350,15 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -358,6 +361,15 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -81,15 +81,15 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
@Inject
|
||||
public ThemeOverlayController(Context context, BroadcastDispatcher broadcastDispatcher,
|
||||
@Background Handler bgHandler, @Main Executor mainExecutor,
|
||||
@@ -358,7 +370,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
configurationController) {
|
||||
@@ -369,7 +381,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
configurationController, SystemSettings systemSettings) {
|
||||
super(context);
|
||||
|
||||
- mIsMonetEnabled = featureFlags.isMonetEnabled();
|
||||
mConfigurationController = configurationController;
|
||||
mDeviceProvisionedController = deviceProvisionedController;
|
||||
mBroadcastDispatcher = broadcastDispatcher;
|
||||
@@ -408,10 +419,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -441,10 +452,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
},
|
||||
UserHandle.USER_ALL);
|
||||
|
||||
|
@ -100,7 +100,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor);
|
||||
|
||||
mConfigurationController.addCallback(mConfigurationListener);
|
||||
@@ -419,8 +426,8 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -452,8 +459,8 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
|
||||
// Upon boot, make sure we have the most up to date colors
|
||||
Runnable updateColors = () -> {
|
||||
|
@ -111,7 +111,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
Runnable applyColors = () -> {
|
||||
if (DEBUG) Log.d(TAG, "Boot colors: " + systemColor);
|
||||
mCurrentColors.put(mUserTracker.getUserId(), systemColor);
|
||||
@@ -446,7 +453,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -479,7 +486,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@Override
|
||||
public void onFinishedGoingToSleep() {
|
||||
final int userId = mUserTracker.getUserId();
|
||||
|
@ -120,7 +120,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
if (colors != null) {
|
||||
int flags = mDeferredWallpaperColorsFlags.get(userId);
|
||||
|
||||
@@ -457,10 +464,27 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -490,10 +497,27 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -149,7 +149,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
final int mainColor;
|
||||
final int accentCandidate;
|
||||
if (currentColors == null) {
|
||||
@@ -479,14 +503,12 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -512,14 +536,12 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
mMainWallpaperColor = mainColor;
|
||||
mWallpaperAccentColor = accentCandidate;
|
||||
|
||||
|
@ -170,7 +170,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
}
|
||||
|
||||
updateThemeOverlays();
|
||||
@@ -563,7 +585,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -593,7 +615,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
|
||||
// Let's generate system overlay if the style picker decided to override it.
|
||||
OverlayIdentifier systemPalette = categoryToPackage.get(OVERLAY_CATEGORY_SYSTEM_PALETTE);
|
||||
|
@ -179,7 +179,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
try {
|
||||
String colorString = systemPalette.getPackageName().toLowerCase();
|
||||
if (!colorString.startsWith("#")) {
|
||||
@@ -577,20 +599,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -607,20 +629,11 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
// Color.parseColor doesn't catch any exceptions from the calls it makes
|
||||
Log.w(TAG, "Invalid color definition: " + systemPalette.getPackageName(), e);
|
||||
}
|
||||
|
@ -201,7 +201,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
try {
|
||||
String colorString = accentPalette.getPackageName().toLowerCase();
|
||||
if (!colorString.startsWith("#")) {
|
||||
@@ -604,7 +617,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -634,7 +647,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
// Color.parseColor doesn't catch any exceptions from the calls it makes
|
||||
Log.w(TAG, "Invalid color definition: " + accentPalette.getPackageName(), e);
|
||||
}
|
||||
|
@ -210,7 +210,7 @@ index 482a70defb3f..02c1ab5f82f6 100644
|
|||
try {
|
||||
Integer.parseInt(accentPalette.getPackageName().toLowerCase(), 16);
|
||||
categoryToPackage.remove(OVERLAY_CATEGORY_ACCENT_COLOR);
|
||||
@@ -654,7 +667,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
@@ -692,7 +705,6 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
|
||||
pw.println("mWallpaperAccentColor=" + Integer.toHexString(mWallpaperAccentColor));
|
||||
pw.println("mSecondaryOverlay=" + mSecondaryOverlay);
|
||||
pw.println("mNeutralOverlay=" + mNeutralOverlay);
|
||||
|
|
|
@ -76,7 +76,7 @@ index a3ee437..c4532c5 100644
|
|||
The array should be sorted in the same order as the
|
||||
touchscreen gestures advertised by the device's LineageHW impl. -->
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 7d489dd..ed8b29d 100644
|
||||
index 9d88587..7ce522a 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -532,28 +532,6 @@
|
||||
|
|
|
@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644
|
|||
android:id="@+id/private_dns_mode_opportunistic"
|
||||
layout="@layout/preference_widget_dialog_radiobutton"/>
|
||||
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
|
||||
index 643aea9acb..dd1e7be283 100644
|
||||
index e89ab77edd..925a386cd9 100644
|
||||
--- a/res/values/cm_strings.xml
|
||||
+++ b/res/values/cm_strings.xml
|
||||
@@ -74,6 +74,21 @@
|
||||
@@ -78,6 +78,21 @@
|
||||
<!-- Volume link notification -->
|
||||
<string name="volume_link_notification_title">Link ring & notification volumes</string>
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ index f2d0f21..d5f0c46 100755
|
|||
|
||||
diff --git a/src/com/android/customization/model/monet/MonetModeSectionController.java b/src/com/android/customization/model/monet/MonetModeSectionController.java
|
||||
new file mode 100644
|
||||
index 0000000..214d6b1
|
||||
index 0000000..95796a1
|
||||
--- /dev/null
|
||||
+++ b/src/com/android/customization/model/monet/MonetModeSectionController.java
|
||||
@@ -0,0 +1,126 @@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue