From: LuK1337 Date: Thu, 30 Mar 2017 19:03:02 +0000 (+0200) Subject: Update OMS patches X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d1b877b33a2aec24d14d89c82c84cd0316bbce3e;p=GitHub%2FStricted%2Fandroid_vendor_extra.git Update OMS patches --- diff --git a/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch b/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch index dcc9e13..79ce217 100644 --- a/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch +++ b/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch @@ -1,7 +1,7 @@ -From d6b3f93bec61769fab7ebf31e78bf0acb42bb2e6 Mon Sep 17 00:00:00 2001 +From 6ddf49b9c0a75e3d2cc7ac08775ad3f7ed522cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Tue, 15 Dec 2015 16:08:31 +0100 -Subject: [PATCH 01/42] OMS7-N: Support tagging resources as OK to overlay +Subject: [PATCH 01/43] OMS7-N: Support tagging resources as OK to overlay [1/11] This will allow applications to have a resource xml defining what @@ -33,7 +33,7 @@ Change-Id: I08d11de845c1679017798ea1636ef4c36f820d8e 7 files changed, 164 insertions(+), 15 deletions(-) diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp -index c13d318..8656b0e 100644 +index c13d318f744..8656b0e0e5f 100644 --- a/cmds/idmap/create.cpp +++ b/cmds/idmap/create.cpp @@ -106,7 +106,7 @@ fail: @@ -46,7 +46,7 @@ index c13d318..8656b0e 100644 return true; } diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp -index f6afc85..924090f 100644 +index f6afc859430..924090fbb9d 100644 --- a/cmds/idmap/inspect.cpp +++ b/cmds/idmap/inspect.cpp @@ -192,6 +192,12 @@ namespace { @@ -63,7 +63,7 @@ index f6afc85..924090f 100644 err = buf.nextUint32(&i); diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h -index 12a6b0f..6094a57 100644 +index 12a6b0f9a4e..6094a576d75 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1382,7 +1382,11 @@ struct ResTable_entry @@ -97,7 +97,7 @@ index 12a6b0f..6094a57 100644 String8* pTargetPath, String8* pOverlayPath); diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index 5b36a43..c0e8a98 100644 +index 5b36a43abdc..c0e8a980c2d 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -252,7 +252,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) @@ -110,7 +110,7 @@ index 5b36a43..c0e8a98 100644 delete idmap; return false; diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp -index e8c6fcf..022f19e 100644 +index e8c6fcf03a5..022f19efe86 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -59,7 +59,7 @@ namespace android { @@ -197,7 +197,7 @@ index e8c6fcf..022f19e 100644 if (inclValues) { diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp -index a1b1879..b2d0480 100644 +index a1b1879e745..b2d04802bf1 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -800,6 +800,7 @@ status_t compileResourceFile(Bundle* bundle, @@ -367,7 +367,7 @@ index a1b1879..b2d0480 100644 : mName(name), mPackageId(packageId), mTypeStringsMapping(0xffffffff), diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h -index 54d56cf..7e9b044 100644 +index 54d56cfc26f..7e9b04429cc 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -139,6 +139,11 @@ public: @@ -470,5 +470,5 @@ index 54d56cf..7e9b044 100644 Vector > mOrderedConfigs; SortedVector mCanAddEntries; -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch b/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch index c1d09b4..47e9c5b 100644 --- a/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch +++ b/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch @@ -1,7 +1,7 @@ -From 7cfd3aa15db2d7da9c7e0420cec8669c361e65cd Mon Sep 17 00:00:00 2001 +From 530d2d2d9af63b13b2a907d10d9f1b4a6d2ebbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Tue, 15 Dec 2015 16:40:23 +0100 -Subject: [PATCH 02/42] OMS7-N: Introduce the OverlayManagerService [2/11] +Subject: [PATCH 02/43] OMS7-N: Introduce the OverlayManagerService [2/11] Add a new system service to manage Runtime Resource Overlays. This will offload the PackageManagerService and allow administration of overlay @@ -84,7 +84,7 @@ Change-Id: Icc3c7daa25345d20bc5014b865024422eab72f5b create mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java diff --git a/Android.mk b/Android.mk -index bdb4555..df42780 100644 +index bdb45550fa1..df427801fa7 100644 --- a/Android.mk +++ b/Android.mk @@ -137,6 +137,7 @@ LOCAL_SRC_FILES += \ @@ -96,7 +96,7 @@ index bdb4555..df42780 100644 core/java/android/content/pm/IOnAppsChangedListener.aidl \ core/java/android/content/pm/IOtaDexopt.aidl \ diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java -index 3a2f471..1ca44e0 100644 +index 3a2f471e96e..1ca44e0f633 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3656,6 +3656,16 @@ public abstract class Context { @@ -117,7 +117,7 @@ index 3a2f471..1ca44e0 100644 * process and user ID running in the system. * diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java -index 861aae5..1afae79 100644 +index 861aae5a879..1afae798bcf 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3092,6 +3092,40 @@ public class Intent implements Parcelable, Cloneable { @@ -163,7 +163,7 @@ index 861aae5..1afae79 100644 * {@link DocumentsProvider} instances installed on the device, letting the diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl new file mode 100644 -index 0000000..4f5d960 +index 00000000000..4f5d96038d1 --- /dev/null +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -0,0 +1,129 @@ @@ -298,7 +298,7 @@ index 0000000..4f5d960 +} diff --git a/core/java/android/content/om/OverlayInfo.aidl b/core/java/android/content/om/OverlayInfo.aidl new file mode 100644 -index 0000000..e7d413d +index 00000000000..e7d413d0775 --- /dev/null +++ b/core/java/android/content/om/OverlayInfo.aidl @@ -0,0 +1,19 @@ @@ -323,7 +323,7 @@ index 0000000..e7d413d +parcelable OverlayInfo; diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java new file mode 100644 -index 0000000..a25cf0c +index 00000000000..a25cf0c008c --- /dev/null +++ b/core/java/android/content/om/OverlayInfo.java @@ -0,0 +1,290 @@ @@ -618,7 +618,7 @@ index 0000000..a25cf0c + } +} diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java -index f5bcf64..bdbdd1e 100644 +index f5bcf64417a..bdbdd1ebcf9 100644 --- a/core/java/android/content/pm/PackageManagerInternal.java +++ b/core/java/android/content/pm/PackageManagerInternal.java @@ -168,4 +168,28 @@ public abstract class PackageManagerInternal { @@ -651,7 +651,7 @@ index f5bcf64..bdbdd1e 100644 + public abstract void setResourceDirs(int userId, String packageName, String[] resourceDirs); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 2c76dee..6a5bd39 100644 +index 2c76dee9754..6a5bd3946db 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -84,6 +84,10 @@ @@ -667,7 +667,7 @@ index 2c76dee..6a5bd39 100644 diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java new file mode 100644 -index 0000000..e2a3775 +index 00000000000..e2a37750ef3 --- /dev/null +++ b/services/core/java/com/android/server/om/IdmapManager.java @@ -0,0 +1,116 @@ @@ -789,7 +789,7 @@ index 0000000..e2a3775 +} diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java new file mode 100644 -index 0000000..ec148dd +index 00000000000..ec148dd9fa7 --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -0,0 +1,901 @@ @@ -1696,7 +1696,7 @@ index 0000000..ec148dd +} diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java new file mode 100644 -index 0000000..2a0d88b +index 00000000000..2a0d88b416d --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -0,0 +1,478 @@ @@ -2180,7 +2180,7 @@ index 0000000..2a0d88b +} diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java new file mode 100644 -index 0000000..af0bb64 +index 00000000000..af0bb64bd67 --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -0,0 +1,656 @@ @@ -2842,7 +2842,7 @@ index 0000000..af0bb64 +} diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java new file mode 100644 -index 0000000..d6f5373 +index 00000000000..d6f53737913 --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java @@ -0,0 +1,179 @@ @@ -3026,7 +3026,7 @@ index 0000000..d6f5373 + } +} diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 4cfa3d5..7860bbd 100644 +index 4cfa3d5d40c..7860bbdaf5d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -21460,6 +21460,47 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); @@ -3078,5 +3078,5 @@ index 4cfa3d5..7860bbd 100644 @Override -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch b/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch index 3214cae..222f319 100644 --- a/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch +++ b/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch @@ -1,7 +1,7 @@ -From f6bfedb67fced7d53d515b73bb4730215c2dc9e4 Mon Sep 17 00:00:00 2001 +From 8bb866e77295f38e512a8b0bff7dbb4d2ad0ee22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 2 Jun 2016 09:35:31 +0200 -Subject: [PATCH 03/42] OMS7-N: Integrate OverlayManagerService into framework +Subject: [PATCH 03/43] OMS7-N: Integrate OverlayManagerService into framework [3/11] Hand over ownership of overlays to OverlayManagerService. @@ -65,7 +65,7 @@ Change-Id: If0b1eaa690c38f9c33f7c8dc981314205a73fa9c 21 files changed, 337 insertions(+), 481 deletions(-) diff --git a/cmds/idmap/Android.mk b/cmds/idmap/Android.mk -index 50ccb07..eb6da18 100644 +index 50ccb07a382..eb6da18ea0a 100644 --- a/cmds/idmap/Android.mk +++ b/cmds/idmap/Android.mk @@ -15,7 +15,7 @@ @@ -78,7 +78,7 @@ index 50ccb07..eb6da18 100644 LOCAL_SHARED_LIBRARIES := liblog libutils libandroidfw diff --git a/cmds/idmap/idmap.cpp b/cmds/idmap/idmap.cpp -index 3ab1915..d388977 100644 +index 3ab19155362..d388977e8e2 100644 --- a/cmds/idmap/idmap.cpp +++ b/cmds/idmap/idmap.cpp @@ -13,8 +13,6 @@ SYNOPSIS \n\ @@ -172,7 +172,7 @@ index 3ab1915..d388977 100644 return maybe_inspect(argv[2]); } diff --git a/cmds/idmap/idmap.h b/cmds/idmap/idmap.h -index 8d4210b..5914de9 100644 +index 8d4210bcb44..5914de96a99 100644 --- a/cmds/idmap/idmap.h +++ b/cmds/idmap/idmap.h @@ -25,12 +25,6 @@ int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path, @@ -189,7 +189,7 @@ index 8d4210b..5914de9 100644 #endif // _IDMAP_H_ diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java -index 50479c8..389f342 100644 +index 50479c8e951..389f3422fb5 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -16,6 +16,7 @@ @@ -244,7 +244,7 @@ index 50479c8..389f342 100644 throws RemoteException { Parcel data = Parcel.obtain(); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java -index 2d22f26..55fc25d 100644 +index 2d22f26069f..55fc25de68b 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -897,6 +897,14 @@ public final class ActivityThread { @@ -328,7 +328,7 @@ index 2d22f26..55fc25d 100644 if (configDiff != 0) { // Ask text layout engine to free its caches if there is a locale change diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java -index 05d9d7e..47b05ee 100644 +index 05d9d7e412f..47b05eee470 100644 --- a/core/java/android/app/ApplicationThreadNative.java +++ b/core/java/android/app/ApplicationThreadNative.java @@ -16,6 +16,7 @@ @@ -374,7 +374,7 @@ index 05d9d7e..47b05ee 100644 Parcel data = Parcel.obtain(); data.writeInterfaceToken(IApplicationThread.descriptor); diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java -index 5a4470b..c7522b9 100644 +index 5a4470b2ecd..c7522b9fc55 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -266,6 +266,7 @@ public interface IActivityManager extends IInterface { @@ -392,7 +392,7 @@ index 5a4470b..c7522b9 100644 + int UPDATE_ASSETS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 381; } diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java -index 3fa88ae..fcc97e3 100644 +index 3fa88ae674a..fcc97e3d719 100644 --- a/core/java/android/app/IApplicationThread.java +++ b/core/java/android/app/IApplicationThread.java @@ -104,6 +104,7 @@ public interface IApplicationThread extends IInterface { @@ -410,7 +410,7 @@ index 3fa88ae..fcc97e3 100644 + int SCHEDULE_ASSETS_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+61; } diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java -index 4916c1c..8cbca31 100644 +index 4916c1c1f5c..8cbca31a66c 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -29,6 +29,7 @@ import android.content.res.ResourcesImpl; @@ -566,7 +566,7 @@ index 4916c1c..8cbca31 100644 } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index f2e3333..77b70135f 100644 +index f2e3333b67d..77b70135f77 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -668,10 +668,9 @@ public class PackageParser { @@ -626,7 +626,7 @@ index f2e3333..77b70135f 100644 public static ApplicationInfo generateApplicationInfo(Package p, int flags, diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java -index e64e4c4..8357395 100644 +index e64e4c4cc5e..83573951712 100644 --- a/core/java/android/content/pm/PackageUserState.java +++ b/core/java/android/content/pm/PackageUserState.java @@ -31,6 +31,8 @@ import android.util.ArraySet; @@ -658,7 +658,7 @@ index e64e4c4..8357395 100644 /** diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp -index 1a7294f..6c5a88f 100644 +index 1a7294f1424..6c5a88fa827 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -129,85 +129,6 @@ jint copyValue(JNIEnv* env, jobject outValue, const ResTable* table, @@ -771,7 +771,7 @@ index 1a7294f..6c5a88f 100644 if (am == NULL) { jniThrowException(env, "java/lang/OutOfMemoryError", ""); diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h -index 2d5f4c2..0326e2b 100644 +index 2d5f4c2f90b..0326e2b3d33 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -238,12 +238,10 @@ public: @@ -829,7 +829,7 @@ index 2d5f4c2..0326e2b 100644 void closeZip(int idx); diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index c0e8a98..b995457 100644 +index c0e8a980c2d..b9954573d79 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -214,15 +214,6 @@ bool AssetManager::addAssetPath( @@ -987,7 +987,7 @@ index c0e8a98..b995457 100644 * Compute the zip file's index. * diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java -index 90f507c..904c967 100644 +index 90f507c146b..904c967acdc 100644 --- a/services/core/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -16,6 +16,7 @@ @@ -1035,7 +1035,7 @@ index 90f507c..904c967 100644 * Starts the specified boot phase for all system services that have been started up to * this point. diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index a3923b9..f4d07af 100644 +index a3923b94ef9..f4d07aff3e6 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19344,6 +19344,57 @@ public final class ActivityManagerService extends ActivityManagerNative @@ -1097,7 +1097,7 @@ index a3923b9..f4d07af 100644 * crash, etc dialogs. The idea is that if there is no affordence to * press the on-screen buttons, or the user experience would be more diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index ec148dd..761ef52 100644 +index ec148dd9fa7..761ef5240ec 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -676,37 +676,36 @@ public final class OverlayManagerService extends SystemService { @@ -1169,7 +1169,7 @@ index ec148dd..761ef52 100644 private void schedulePersistSettings() { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 7860bbd..1d9a590 100644 +index 7860bbdaf5d..1d9a5906f34 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -400,17 +400,16 @@ public class PackageManagerService extends IPackageManager.Stub { @@ -1388,7 +1388,7 @@ index 7860bbd..1d9a590 100644 } diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java -index 75427a8..d0c7f25 100644 +index 75427a8b75a..d0c7f256278 100644 --- a/services/core/java/com/android/server/pm/PackageSettingBase.java +++ b/services/core/java/com/android/server/pm/PackageSettingBase.java @@ -21,6 +21,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED @@ -1429,7 +1429,7 @@ index 75427a8..d0c7f25 100644 PackageUserState state = modifyUserStateComponents(userId, false, true); boolean changed = state.disabledComponents != null diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java -index 285b5bb..f00080c 100755 +index 285b5bbf3ec..f00080ce739 100755 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -813,6 +813,7 @@ final class Settings { @@ -1458,7 +1458,7 @@ index 285b5bb..f00080c 100755 readPreferredActivitiesLPw(parser, userId); } else if (tagName.equals(TAG_PERSISTENT_PREFERRED_ACTIVITIES)) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java -index 6f21417..ab425c0 100644 +index 6f2141708ed..ab425c05e95 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -85,6 +85,7 @@ import com.android.server.media.projection.MediaProjectionManagerService; @@ -1480,5 +1480,5 @@ index 6f21417..ab425c0 100644 // service, and permissions service, therefore we start it after them. startSensorService(); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch b/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch index edac750..6482701 100644 --- a/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch +++ b/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch @@ -1,7 +1,7 @@ -From c55ae74be951a94f19d9e2f97b2f74156dabe718 Mon Sep 17 00:00:00 2001 +From f6789b7f83d4054e8dc87a4cf301cd5dc1cfe6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Mon, 25 Apr 2016 16:29:22 +0200 -Subject: [PATCH 04/42] OMS7-N: Set EXTRA_REPLACING correctly in +Subject: [PATCH 04/43] OMS7-N: Set EXTRA_REPLACING correctly in ACTION_PACKAGE_ADDED [4/11] When broadcasting ACTION_PACKAGE_ADDED the recipients of the Intent are @@ -35,7 +35,7 @@ Change-Id: Icf869013d5d652de4bf0f6df4529b7a68d35a25c 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 1d9a590..f1dfbae 100644 +index 1d9a5906f34..f1dfbae5eda 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -1718,6 +1718,7 @@ public class PackageManagerService extends IPackageManager.Stub { @@ -47,5 +47,5 @@ index 1d9a590..f1dfbae 100644 } sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName, -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch b/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch index cb06a20..b1ccddf 100644 --- a/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch +++ b/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch @@ -1,7 +1,7 @@ -From cca20e72b03339f1084d69dc89d13d96bd2529df Mon Sep 17 00:00:00 2001 +From 32eeeb1e5844e8cab7d3d7b685407db41921bb12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Mon, 29 Feb 2016 14:12:35 +0100 -Subject: [PATCH 05/42] OMS7-N: idmap: suppress print for padded resources +Subject: [PATCH 05/43] OMS7-N: idmap: suppress print for padded resources [5/11] Change-Id: I565ccf515068b96927e4317cc9c06543415bb324 @@ -10,7 +10,7 @@ Change-Id: I565ccf515068b96927e4317cc9c06543415bb324 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp -index 924090f..cb52a39 100644 +index 924090fbb9d..cb52a394427 100644 --- a/cmds/idmap/inspect.cpp +++ b/cmds/idmap/inspect.cpp @@ -289,7 +289,9 @@ namespace { @@ -25,5 +25,5 @@ index 924090f..cb52a39 100644 } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch b/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch index ecb7285..9d07124 100644 --- a/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch +++ b/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch @@ -1,7 +1,7 @@ -From 1a29f1792ba225dd491f43d3ade34ee6366ea4c0 Mon Sep 17 00:00:00 2001 +From 4210f552c46cfb86b861fabb8694a166296b963d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 2 Jun 2016 09:34:36 +0200 -Subject: [PATCH 06/42] OMS7-N: Fix memory leak during idmap creation [6/11] +Subject: [PATCH 06/43] OMS7-N: Fix memory leak during idmap creation [6/11] Plug a memory leak in AssetManager::createIdmap. @@ -11,7 +11,7 @@ Change-Id: Ieed805c596df931e2167ebb47c1b2907d6bf67f4 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index b995457..ef580e3 100644 +index b9954573d79..ef580e386ab 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -291,22 +291,34 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk @@ -63,5 +63,5 @@ index b995457..ef580e3 100644 bool AssetManager::addDefaultAssets() -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch b/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch index 96dc6f3..6683327 100644 --- a/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch +++ b/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch @@ -1,7 +1,7 @@ -From 7c06a1ac96cdbd3cd0bf68813edee118adc6338d Mon Sep 17 00:00:00 2001 +From 2989cc072b70ac93ddb38521627bbd82cf8ba5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 2 Jun 2016 09:35:09 +0200 -Subject: [PATCH 07/42] OMS7-N: installd: add command 'rmidmap' [7/11] +Subject: [PATCH 07/43] OMS7-N: installd: add command 'rmidmap' [7/11] Add an installd command to remove an idmap file. This is the inverse of the 'idmap' command and is intended for clean-up once an idmap file is @@ -16,7 +16,7 @@ Change-Id: I58f55f643da99c0bd69136ee43c1c8c70c352797 1 file changed, 7 insertions(+) diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java -index 2e18b1c..7f618b8 100644 +index 2e18b1c417f..7f618b8134b 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -170,6 +170,13 @@ public final class Installer extends SystemService { @@ -34,5 +34,5 @@ index 2e18b1c..7f618b8 100644 assertValidInstructionSet(instructionSet); mInstaller.execute("rmdex", codePath, instructionSet); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch b/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch index e7e6404..b6ced3b 100644 --- a/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch +++ b/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch @@ -1,7 +1,7 @@ -From 8ba04dc55f9be19336dfba92db5b9761b7ef4828 Mon Sep 17 00:00:00 2001 +From 43c18cb2d696aeabde78e902d6f97a194534846e Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Wed, 26 Jan 2011 23:28:43 -0800 -Subject: [PATCH 08/42] OMS7-N: Disable Zygote preloaded drawables [8/11] +Subject: [PATCH 08/43] OMS7-N: Disable Zygote preloaded drawables [8/11] With a theme applied, most of these preloaded drawables go unused. Any assets the theme has redirected will need to be loaded with each app @@ -19,7 +19,7 @@ Change-Id: I253b1a22482ac664c196533a4c2fcd88ae84b996 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 20f84b5..455849e 100644 +index 20f84b52d19..455849e0c19 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -108,7 +108,7 @@ public class ZygoteInit { @@ -41,5 +41,5 @@ index 20f84b5..455849e 100644 mResources.finishPreloading(); } catch (RuntimeException e) { -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch b/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch index bc06f2a..1036f87 100644 --- a/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch +++ b/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch @@ -1,7 +1,7 @@ -From 86352b365ebc436025efd731970432fd4b5e9493 Mon Sep 17 00:00:00 2001 +From 2215cc9ea9b36811edba085972e4188097a95367 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Sun, 19 Jun 2016 10:37:13 -0400 -Subject: [PATCH 09/42] OMS7-N: Persistence on boot through +Subject: [PATCH 09/43] OMS7-N: Persistence on boot through OverlayManagerServiceImpl [9/11] Overlays should not be enforced by the traditional OverlayManagerService @@ -14,7 +14,7 @@ Change-Id: Ic6eeb38b5e7bcec4211405d4504ba37a75738227 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java -index 2a0d88b..4c61968 100644 +index 2a0d88b416d..4c6196824cf 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -402,34 +402,45 @@ final class OverlayManagerServiceImpl { @@ -74,5 +74,5 @@ index 2a0d88b..4c61968 100644 private void removeIdmapIfPossible(@NonNull final OverlayInfo oi) { -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch b/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch index a7af494..f578b4f 100644 --- a/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch +++ b/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch @@ -1,7 +1,7 @@ -From aaa0557792eacf970fa7a1288e7d3aacce1f9a38 Mon Sep 17 00:00:00 2001 +From 88288f5b6d0a6ec1bdc270542660c366cbb1652b Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Thu, 27 Oct 2016 07:08:00 +0200 -Subject: [PATCH 10/42] OMS7-N: Do not enforce code policy limiting overlay +Subject: [PATCH 10/43] OMS7-N: Do not enforce code policy limiting overlay installation [10/11] Change-Id: Iea317f3771f25dbfcbf4938e88cace12fd97d7eb @@ -10,7 +10,7 @@ Change-Id: Iea317f3771f25dbfcbf4938e88cace12fd97d7eb 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index f1dfbae..a57b79a 100644 +index f1dfbae5eda..a57b79af02e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8152,10 +8152,6 @@ public class PackageManagerService extends IPackageManager.Stub { @@ -25,5 +25,5 @@ index f1dfbae..a57b79a 100644 mCustomResolverComponentName.getPackageName().equals(pkg.packageName)) { setUpCustomResolverActivity(pkg); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch b/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch index 9ab6a47..c574cf9 100644 --- a/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch +++ b/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch @@ -1,7 +1,7 @@ -From 06bfbbb1324d1d492c3ea5a72d3d502acd5fa584 Mon Sep 17 00:00:00 2001 +From d96b02490d5d19fac7796afb79965566a3457505 Mon Sep 17 00:00:00 2001 From: Jacob McSwain Date: Sun, 26 Jun 2016 15:21:52 -0500 -Subject: [PATCH 11/42] OMS7-N: Implement multi-target enable/disable and +Subject: [PATCH 11/43] OMS7-N: Implement multi-target enable/disable and disable-all [11/11] Just use the enable option like normal, but you can add more arguments @@ -27,7 +27,7 @@ Change-Id: I04a595084a87b8260b5c534c4f5f111adbe154d7 5 files changed, 161 insertions(+), 44 deletions(-) diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl -index 4f5d960..8e349dc 100644 +index 4f5d96038d1..8e349dcf6ca 100644 --- a/core/java/android/content/om/IOverlayManager.aidl +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -83,10 +83,12 @@ interface IOverlayManager { @@ -56,7 +56,7 @@ index 4f5d960..8e349dc 100644 + void refresh(in int uid); } diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index 761ef52..deb9046 100644 +index 761ef5240ec..deb9046a2d4 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -255,7 +255,7 @@ public final class OverlayManagerService extends SystemService { @@ -178,7 +178,7 @@ index 761ef52..deb9046 100644 final boolean updateFrameworkRes = targetPackageNames.contains("android"); if (updateFrameworkRes) { diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java -index 4c61968..c515640 100644 +index 4c6196824cf..c5156403b3f 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -324,7 +324,7 @@ final class OverlayManagerServiceImpl { @@ -222,7 +222,7 @@ index 4c61968..c515640 100644 } diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java -index af0bb64..935ea02 100644 +index af0bb64bd67..935ea02890b 100644 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -76,7 +76,7 @@ final class OverlayManagerSettings { @@ -321,7 +321,7 @@ index af0bb64..935ea02 100644 } diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java -index d6f5373..44004c1 100644 +index d6f53737913..44004c140a4 100644 --- a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java +++ b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java @@ -25,8 +25,10 @@ import android.os.ShellCommand; @@ -466,5 +466,5 @@ index d6f5373..44004c1 100644 private int runSetPriority() throws RemoteException { -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch b/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch index ba16d38..7642d78 100644 --- a/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch +++ b/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch @@ -1,7 +1,7 @@ -From 7b1552ee2ed76963296292ea14612993a31f9500 Mon Sep 17 00:00:00 2001 +From 93377f9b5801d144f20222c5c18707aef1b440ef Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Fri, 9 Dec 2016 10:47:17 -0700 -Subject: [PATCH 12/42] Themes: Expose resolver hardcoded colors +Subject: [PATCH 12/43] Themes: Expose resolver hardcoded colors commit dbbd5e70cc65002df41561474b03362022dd6716 Author: Dave Kover @@ -56,7 +56,7 @@ Change-Id: Iec7951147bbbc99aee6b06ae50c1acc7b9c01a7f create mode 100644 core/res/res/values/projekt_colors.xml diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml -index d8dd447..78c2e05 100644 +index d8dd447e6a7..78c2e05f372 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -31,7 +31,7 @@ @@ -87,7 +87,7 @@ index d8dd447..78c2e05 100644 android:padding="32dp" android:gravity="center" diff --git a/core/res/res/layout/resolver_different_item_header.xml b/core/res/res/layout/resolver_different_item_header.xml -index 5889136..201c8c6 100644 +index 58891363e20..201c8c686fe 100644 --- a/core/res/res/layout/resolver_different_item_header.xml +++ b/core/res/res/layout/resolver_different_item_header.xml @@ -29,6 +29,6 @@ @@ -99,7 +99,7 @@ index 5889136..201c8c6 100644 android:elevation="8dp" /> diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml -index c4e8e9c..1b6230a 100644 +index c4e8e9cb63b..1b6230a5a09 100644 --- a/core/res/res/layout/resolver_list.xml +++ b/core/res/res/layout/resolver_list.xml @@ -30,7 +30,7 @@ @@ -139,7 +139,7 @@ index c4e8e9c..1b6230a 100644 android:paddingBottom="8dp" android:paddingStart="12dp" diff --git a/core/res/res/layout/resolver_list_with_default.xml b/core/res/res/layout/resolver_list_with_default.xml -index 02dc2ed..d3baf68 100644 +index 02dc2ede430..d3baf682fe0 100644 --- a/core/res/res/layout/resolver_list_with_default.xml +++ b/core/res/res/layout/resolver_list_with_default.xml @@ -29,7 +29,7 @@ @@ -171,7 +171,7 @@ index 02dc2ed..d3baf68 100644 android:divider="@null" /> diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml new file mode 100644 -index 0000000..c6dbc1c +index 00000000000..c6dbc1ca1c9 --- /dev/null +++ b/core/res/res/values/projekt_colors.xml @@ -0,0 +1,20 @@ @@ -196,5 +196,5 @@ index 0000000..c6dbc1c + @color/white + -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch b/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch index 67f6f41..09de0b9 100644 --- a/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch +++ b/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch @@ -1,7 +1,7 @@ -From 2ecc0b5270d86d0a9af8aacc246d8aaa68267649 Mon Sep 17 00:00:00 2001 +From 17c154fb0703f4da107935f5886471fa474e1bf9 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Tue, 17 Nov 2015 18:57:11 -0500 -Subject: [PATCH 13/42] Themes: Allow Immersive cling colors to be fully themed +Subject: [PATCH 13/43] Themes: Allow Immersive cling colors to be fully themed This allows the immersive mode help tooltip to be themed completely by removing hardcoded framework calls. Let the themer decide what they want @@ -14,7 +14,7 @@ Change-Id: Ia0927fda5e44a3ce8ef699cb018bea9b9e7ace62 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/res/res/layout/immersive_mode_cling.xml b/core/res/res/layout/immersive_mode_cling.xml -index b08b0f4..6dbde20 100644 +index b08b0f4d59c..6dbde20d481 100644 --- a/core/res/res/layout/immersive_mode_cling.xml +++ b/core/res/res/layout/immersive_mode_cling.xml @@ -16,7 +16,7 @@ @@ -65,7 +65,7 @@ index b08b0f4..6dbde20 100644 \ No newline at end of file + diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml -index c6dbc1c..7408ae9 100644 +index c6dbc1ca1c9..7408ae99682 100644 --- a/core/res/res/values/projekt_colors.xml +++ b/core/res/res/values/projekt_colors.xml @@ -17,4 +17,7 @@ @@ -77,5 +77,5 @@ index c6dbc1c..7408ae9 100644 + @android:color/white -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch b/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch index 458ea81..a18c2cd 100644 --- a/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch +++ b/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch @@ -1,7 +1,7 @@ -From 6ad7fce1c7b6e8f5f9fe5110d711a461862427d0 Mon Sep 17 00:00:00 2001 +From 8417ab2fdbf0d911775210e2f6e5b9d8265b72e2 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Mon, 23 Nov 2015 23:49:15 -0500 -Subject: [PATCH 14/42] Themes: Allow Permission Icons to be fully themed +Subject: [PATCH 14/43] Themes: Allow Permission Icons to be fully themed This removes the forced @android:color/black tint on the permission icons during app sideload through PackageInstaller. @@ -17,7 +17,7 @@ Change-Id: I31eb5021a6d297997dbba156f98cbf47f2102b6c 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/res/res/layout/app_permission_item.xml b/core/res/res/layout/app_permission_item.xml -index 383d771..a80d40e 100644 +index 383d771074e..a80d40efd2b 100644 --- a/core/res/res/layout/app_permission_item.xml +++ b/core/res/res/layout/app_permission_item.xml @@ -32,7 +32,7 @@ @@ -30,7 +30,7 @@ index 383d771..a80d40e 100644 @android:color/black -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch b/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch index be8de07..785c525 100644 --- a/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch +++ b/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch @@ -1,7 +1,7 @@ -From 8876a0aa62178dc7585af7708c2d6223bd370c1a Mon Sep 17 00:00:00 2001 +From 511aee76b3b17988444d06b27fbd0c0e0751fdd7 Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Thu, 14 Apr 2016 10:19:13 +0700 -Subject: [PATCH 15/42] Themes: Allow Navbar ripple color to be themed +Subject: [PATCH 15/43] Themes: Allow Navbar ripple color to be themed PS1: Layers Commit by @setiawanjimmy @@ -18,7 +18,7 @@ Change-Id: I7969e952d7e08f1d12e89291512312421585b70f diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml new file mode 100644 -index 0000000..a0f1df0 +index 00000000000..a0f1df06b6a --- /dev/null +++ b/packages/SystemUI/res/values/projekt_colors.xml @@ -0,0 +1,21 @@ @@ -44,7 +44,7 @@ index 0000000..a0f1df0 + #FFFFFFFF + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java -index 57e092a..2579579 100644 +index 57e092a2603..2579579b0e7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java @@ -65,16 +65,19 @@ public class KeyButtonRipple extends Drawable { @@ -69,5 +69,5 @@ index 57e092a..2579579 100644 return mRipplePaint; } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch b/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch index 6e7b46a..57bcd09 100644 --- a/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch +++ b/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch @@ -1,7 +1,7 @@ -From 9477253b8b3f4e282483087f204160dece3e4428 Mon Sep 17 00:00:00 2001 +From 7cffd2c8451b327dced0bf6abcb81b4626d4f0a9 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Sun, 18 Sep 2016 21:33:18 +0700 -Subject: [PATCH 16/42] SystemUI: Expose QS edit item decoration background +Subject: [PATCH 16/43] SystemUI: Expose QS edit item decoration background color PS2: @@ -16,7 +16,7 @@ Change-Id: I9867ca26e7d9dacad37d2b70180a98fede0fb0e8 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml -index a0f1df0..42f4a15 100644 +index a0f1df06b6a..42f4a1568df 100644 --- a/packages/SystemUI/res/values/projekt_colors.xml +++ b/packages/SystemUI/res/values/projekt_colors.xml @@ -18,4 +18,6 @@ @@ -27,7 +27,7 @@ index a0f1df0..42f4a15 100644 + @*android:color/secondary_device_default_settings diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java -index 8d7f6ee..c7a1441 100644 +index 8d7f6ee7285..c7a1441a6b3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -471,11 +471,10 @@ public class TileAdapter extends RecyclerView.Adapter implements TileSta @@ -54,5 +54,5 @@ index 8d7f6ee..c7a1441 100644 mDrawable.setBounds(0, top, width, bottom); mDrawable.draw(c); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch b/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch index d195140..44bc82f 100644 --- a/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch +++ b/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch @@ -1,7 +1,7 @@ -From 8fc38c23be0ec9307c342bc86b341cc6ae6a41a1 Mon Sep 17 00:00:00 2001 +From f4627c1afcbf294df777f797f14033587545a8d8 Mon Sep 17 00:00:00 2001 From: Simao Gomes Viana Date: Fri, 25 Nov 2016 20:50:29 +0100 -Subject: [PATCH 17/42] Allow custom alpha for notification shade bg color +Subject: [PATCH 17/43] Allow custom alpha for notification shade bg color Change-Id: If621df83d994feae0448a734408ba85ac8329325 --- @@ -9,7 +9,7 @@ Change-Id: If621df83d994feae0448a734408ba85ac8329325 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java -index a6fe438..5cf0e0a 100644 +index a6fe4382475..5cf0e0a1e10 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -430,19 +430,33 @@ public class NotificationStackScrollLayout extends ViewGroup @@ -60,5 +60,5 @@ index a6fe438..5cf0e0a 100644 invalidate(); } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch b/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch index c320241..8f21388 100644 --- a/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch +++ b/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch @@ -1,7 +1,7 @@ -From 30bf956d73cf8598d67a2ddd1156f77085a20aa2 Mon Sep 17 00:00:00 2001 +From cba50dd83ffb3ed8432fe52c94f439440cc19887 Mon Sep 17 00:00:00 2001 From: "Niklas Schnettler (Sh4dowSoul)" Date: Wed, 5 Oct 2016 18:07:43 +0200 -Subject: [PATCH 18/42] Themes: Expose various QuickSettings text colors +Subject: [PATCH 18/43] Themes: Expose various QuickSettings text colors Change-Id: Iaea71ca83afbc3d8cc6faea6afac16cabb46cfff --- @@ -11,7 +11,7 @@ Change-Id: Iaea71ca83afbc3d8cc6faea6afac16cabb46cfff 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/res/layout/qs_customize_panel_content.xml b/packages/SystemUI/res/layout/qs_customize_panel_content.xml -index 04d0e65..9c23250 100644 +index 04d0e6524ea..9c232502651 100644 --- a/packages/SystemUI/res/layout/qs_customize_panel_content.xml +++ b/packages/SystemUI/res/layout/qs_customize_panel_content.xml @@ -23,7 +23,8 @@ @@ -25,7 +25,7 @@ index 04d0e65..9c23250 100644 #FFFFFF -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch b/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch index 8d9e0f2..24c0494 100644 --- a/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch +++ b/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch @@ -1,7 +1,7 @@ -From c73759dcac1c4ef9785958f9520eb67e3eca3b6a Mon Sep 17 00:00:00 2001 +From 2d03c8fcd087f85cc3539aec56157dbce4cd2c7e Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Sat, 27 Aug 2016 10:56:46 -0400 -Subject: [PATCH 19/42] Notifications: Expose a bool to disable dynamic colors +Subject: [PATCH 19/43] Notifications: Expose a bool to disable dynamic colors This commit allows a themer to overlay a boolean value in config.xml to disable dynamic colors applied to the app title and app icon of each @@ -22,7 +22,7 @@ Change-Id: I3c7828118991ec4fc616011caf073c81f75428b4 create mode 100644 core/res/res/values/projekt_symbols.xml diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java -index 9f217d4..55029aa 100644 +index 9f217d48aa8..55029aad4ae 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -29,6 +29,7 @@ import android.content.pm.ApplicationInfo; @@ -85,7 +85,7 @@ index 9f217d4..55029aa 100644 } CharSequence text = m.mText == null ? "" : m.mText; diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml -index a7316ab..d17fbba 100644 +index a7316ab979c..d17fbba053d 100644 --- a/core/res/res/values/projekt_colors.xml +++ b/core/res/res/values/projekt_colors.xml @@ -21,4 +21,6 @@ @@ -97,7 +97,7 @@ index a7316ab..d17fbba 100644 diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml new file mode 100644 -index 0000000..f6eb90a +index 00000000000..f6eb90a49eb --- /dev/null +++ b/core/res/res/values/projekt_config.xml @@ -0,0 +1,25 @@ @@ -128,7 +128,7 @@ index 0000000..f6eb90a + diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml new file mode 100644 -index 0000000..f597a5f +index 00000000000..f597a5f3f7b --- /dev/null +++ b/core/res/res/values/projekt_symbols.xml @@ -0,0 +1,25 @@ @@ -158,5 +158,5 @@ index 0000000..f597a5f + + -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch b/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch index 1aa27d3..3a70887 100644 --- a/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch +++ b/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch @@ -1,7 +1,7 @@ -From b7ea2bb030773f7100c91c233d4644f11fc12b1d Mon Sep 17 00:00:00 2001 +From 42eb4bd5c47d429422bc2d012fd45370d00ccbd8 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 14 Nov 2016 14:49:47 +0200 -Subject: [PATCH 20/42] Notification dynamic colors bool compatible with OMS7 +Subject: [PATCH 20/43] Notification dynamic colors bool compatible with OMS7 OMS7 introduced this fine piece of code: https://github.com/SubstratumResources/platform_frameworks_base/blob/n-oms7/core/java/android/app/ResourcesManager.java#L897..#L904 @@ -22,7 +22,7 @@ Change-Id: I02efe27de3cc7067552964ffbaf079f9e9b5bc3e 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java -index 55029aa..67c2132 100644 +index 55029aad4ae..67c2132b667 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3918,7 +3918,7 @@ public class Notification implements Parcelable @@ -44,5 +44,5 @@ index 55029aa..67c2132 100644 } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch b/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch index 506483b..cca1be3 100644 --- a/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch +++ b/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch @@ -1,7 +1,7 @@ -From d05f1f1d23dbba179cc81afc64ebb7335f4a9d94 Mon Sep 17 00:00:00 2001 +From 6434e6bfc80fb7cdeb04574716af28aa3bc9a188 Mon Sep 17 00:00:00 2001 From: Daniel Koman Date: Fri, 17 Apr 2015 11:56:28 -0600 -Subject: [PATCH 21/42] Allow prevention of doze notification color inversion +Subject: [PATCH 21/43] Allow prevention of doze notification color inversion Removed empty newline at the end -- KreAch3R Removed slims files for aosp roms -- Bgill55 @@ -14,7 +14,7 @@ Change-Id: I2d361c34904f3d168894b8b1741456319fd68456 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml -index f6eb90a..5234959 100644 +index f6eb90a49eb..5234959fc9e 100644 --- a/core/res/res/values/projekt_config.xml +++ b/core/res/res/values/projekt_config.xml @@ -22,4 +22,9 @@ @@ -28,7 +28,7 @@ index f6eb90a..5234959 100644 + diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml -index f597a5f..16a5728 100644 +index f597a5f3f7b..16a5728e6c9 100644 --- a/core/res/res/values/projekt_symbols.xml +++ b/core/res/res/values/projekt_symbols.xml @@ -22,4 +22,7 @@ @@ -40,7 +40,7 @@ index f597a5f..16a5728 100644 + diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java -index 2c96e31..65fd115 100644 +index 2c96e31d9f5..65fd1158b95 100644 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java @@ -20,6 +20,7 @@ import android.animation.Animator; @@ -62,5 +62,5 @@ index 2c96e31..65fd115 100644 for (int i = 0; i < mTargets.size(); i++) { mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch b/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch index 0e72f7c..e90734a 100644 --- a/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch +++ b/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch @@ -1,7 +1,7 @@ -From da2da4fb97e61e83771ac5c6cd573b21f7ed31d2 Mon Sep 17 00:00:00 2001 +From 14d5d1ea48192e941a26b541bef9f35f68bc94f8 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 14 Nov 2016 14:44:17 +0200 -Subject: [PATCH 22/42] OMS7 compatible 'Ambient notification inversion' +Subject: [PATCH 22/43] OMS7 compatible 'Ambient notification inversion' OMS7 introduced this fine piece of code: https://github.com/SubstratumResources/platform_frameworks_base/blob/n-oms7/core/java/android/app/ResourcesManager.java#L897..#L904 @@ -22,7 +22,7 @@ Change-Id: I80ad5d037004f0dc63d9eb746c3af05e59a8834e 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java -index 65fd115..605f381 100644 +index 65fd1158b95..605f381e9e2 100644 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java @@ -20,7 +20,6 @@ import android.animation.Animator; @@ -60,5 +60,5 @@ index 65fd115..605f381 100644 for (int i = 0; i < mTargets.size(); i++) { mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch b/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch index 72756d0..12941ce 100644 --- a/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch +++ b/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch @@ -1,7 +1,7 @@ -From fcabf2291266fe9f9ac8db4d54eba607665874c0 Mon Sep 17 00:00:00 2001 +From e322a665728c13a233b55a6582cb37dd79adf4e5 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Mon, 5 Dec 2016 19:00:04 +0700 -Subject: [PATCH 23/42] SystemUI: Use own drawables for QS expand icon +Subject: [PATCH 23/43] SystemUI: Use own drawables for QS expand icon This was using the volume panel drawables used also on volume panel. So with this commit themers can give different icon for either QS @@ -38,7 +38,7 @@ Change-Id: Ice8d8a520b9b22ba773cceb885e11c8a4bbf6d5f diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml new file mode 100644 -index 0000000..443f2a6 +index 00000000000..443f2a651e5 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml @@ -0,0 +1,25 @@ @@ -70,7 +70,7 @@ index 0000000..443f2a6 \ No newline at end of file diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml new file mode 100644 -index 0000000..b73cdca +index 00000000000..b73cdcad154 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml @@ -0,0 +1,26 @@ @@ -102,7 +102,7 @@ index 0000000..b73cdca + diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml new file mode 100644 -index 0000000..91c83fc +index 00000000000..91c83fc5eff --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml @@ -0,0 +1,26 @@ @@ -134,7 +134,7 @@ index 0000000..91c83fc + diff --git a/packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml new file mode 100644 -index 0000000..e43e645 +index 00000000000..e43e6453d82 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml @@ -0,0 +1,25 @@ @@ -166,7 +166,7 @@ index 0000000..e43e645 \ No newline at end of file diff --git a/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml new file mode 100644 -index 0000000..493bdae +index 00000000000..493bdae7900 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml @@ -0,0 +1,26 @@ @@ -198,7 +198,7 @@ index 0000000..493bdae + diff --git a/packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml new file mode 100644 -index 0000000..58e485c +index 00000000000..58e485c9c74 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml @@ -0,0 +1,26 @@ @@ -230,7 +230,7 @@ index 0000000..58e485c + diff --git a/packages/SystemUI/res/drawable/ic_qs_collapse.xml b/packages/SystemUI/res/drawable/ic_qs_collapse.xml new file mode 100644 -index 0000000..bba6b7f +index 00000000000..bba6b7f1341 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_collapse.xml @@ -0,0 +1,62 @@ @@ -298,7 +298,7 @@ index 0000000..bba6b7f + diff --git a/packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml b/packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml new file mode 100644 -index 0000000..8138b2e +index 00000000000..8138b2e9cff --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml @@ -0,0 +1,29 @@ @@ -333,7 +333,7 @@ index 0000000..8138b2e + diff --git a/packages/SystemUI/res/drawable/ic_qs_expand.xml b/packages/SystemUI/res/drawable/ic_qs_expand.xml new file mode 100644 -index 0000000..bb22064 +index 00000000000..bb220641e81 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_expand.xml @@ -0,0 +1,62 @@ @@ -401,7 +401,7 @@ index 0000000..bb22064 + diff --git a/packages/SystemUI/res/drawable/ic_qs_expand_animation.xml b/packages/SystemUI/res/drawable/ic_qs_expand_animation.xml new file mode 100644 -index 0000000..b561ee0 +index 00000000000..b561ee06ad8 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_expand_animation.xml @@ -0,0 +1,29 @@ @@ -436,7 +436,7 @@ index 0000000..b561ee0 + diff --git a/packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml new file mode 100644 -index 0000000..c3930e4 +index 00000000000..c3930e42cda --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml @@ -0,0 +1,17 @@ @@ -459,7 +459,7 @@ index 0000000..c3930e4 + android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml new file mode 100644 -index 0000000..c3930e4 +index 00000000000..c3930e42cda --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml @@ -0,0 +1,17 @@ @@ -481,7 +481,7 @@ index 0000000..c3930e4 + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java -index a295cfa..0f04c28 100644 +index a295cfacbbc..0f04c28b98c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java @@ -57,11 +57,11 @@ public class ExpandableIndicator extends ImageView { @@ -501,5 +501,5 @@ index a295cfa..0f04c28 100644 } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch b/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch index 5d93cd8..1e3ccae 100644 --- a/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch +++ b/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch @@ -1,7 +1,7 @@ -From 8c8faa693f271deb6db33ccf44fc9f094311bc90 Mon Sep 17 00:00:00 2001 +From 2840673b94cf1a112d1a3ffb7e6f7ac3acb485f0 Mon Sep 17 00:00:00 2001 From: 0xD34D Date: Mon, 20 Jun 2016 22:59:48 +0300 -Subject: [PATCH 24/42] N-Extras: Add dynamic theme BootAnimation support +Subject: [PATCH 24/43] N-Extras: Add dynamic theme BootAnimation support Extracted from "Themes: Port to CM13 [1/3]" http://review.cyanogenmod.org/#/c/113273/14 @@ -12,7 +12,7 @@ Change-Id: I394897c10f02695f0416e87e9bf960e840bcb3b7 1 file changed, 4 insertions(+) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp -index d4a9326..57e1992 100644 +index d4a9326fc0d..57e1992a903 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -68,6 +68,7 @@ namespace android { @@ -34,5 +34,5 @@ index d4a9326..57e1992 100644 mZipFileName = getAnimationFileName(IMG_OEM); } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch b/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch index dce2889..376bbe5 100644 --- a/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch +++ b/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch @@ -1,7 +1,7 @@ -From 85f513176bc75a55eb2c6681994e5ce0315e5745 Mon Sep 17 00:00:00 2001 +From 95cff13c3143cfb03c0ff96bfe44926421f5b41f Mon Sep 17 00:00:00 2001 From: 0xD34D Date: Wed, 22 Jun 2016 23:54:23 +0300 -Subject: [PATCH 25/42] N-Extras: Add dynamic theme fonts support +Subject: [PATCH 25/43] N-Extras: Add dynamic theme fonts support Due to the nature of the removal of assetSeq in OMS7+, we now use the more controllable font scale updating code to update the fonts on @@ -53,7 +53,7 @@ Change-Id: I1f61bd269b42ab6145482a51d25fe5b1b5308f94 8 files changed, 240 insertions(+), 27 deletions(-) diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java -index 55fc25d..44a900b 100644 +index 55fc25de68b..44a900b3a1f 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -48,6 +48,7 @@ import android.database.sqlite.SQLiteDebug; @@ -79,7 +79,7 @@ index 55fc25d..44a900b 100644 } } diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java -index 5a09c00..42febcf 100644 +index 5a09c0028cd..42febcfe59c 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -624,6 +624,11 @@ public class ActivityInfo extends ComponentInfo @@ -95,7 +95,7 @@ index 5a09c00..42febcf 100644 * can itself handle changes to the font scaling factor. Set from the * {@link android.R.attr#configChanges} attribute. This is diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java -index b2d518c..2f7c3ec 100644 +index b2d518c56ca..2f7c3ec18dc 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -955,6 +955,7 @@ public final class Configuration implements Parcelable, Comparable Date: Sun, 17 Jul 2016 17:56:40 -0400 -Subject: [PATCH 26/42] N-Extras: AudioService: Allow system effect sounds to +Subject: [PATCH 26/43] N-Extras: AudioService: Allow system effect sounds to be themed This commit checks whether there is a preexisting file in the themed @@ -17,7 +17,7 @@ Change-Id: I7666c2bd259443ccec442bf6059786bea3dc069e 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java -index f5db488..c6144d0 100644 +index f5db48806de..c6144d0b0b9 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -123,6 +123,7 @@ import com.android.server.pm.UserManagerService; @@ -75,5 +75,5 @@ index f5db488..c6144d0 100644 mediaPlayer.setAudioStreamType(AudioSystem.STREAM_SYSTEM); mediaPlayer.prepare(); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch b/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch index f6d20b5..5a902cf 100644 --- a/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch +++ b/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch @@ -1,7 +1,7 @@ -From 805acc56474ad545d43d1edc43521646ce1d5629 Mon Sep 17 00:00:00 2001 +From 9db19e94c5b923cccf68226643ebc1a9e23dfb36 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 4 Jul 2016 06:25:15 +0300 -Subject: [PATCH 27/42] OMS7-N: ApplicationsState: add filter for Substratum +Subject: [PATCH 27/43] OMS7-N: ApplicationsState: add filter for Substratum overlays [1/2] This commit allows the framework to handle the filtering of the @@ -13,7 +13,7 @@ Change-Id: I7646115e8f73494d726728fac58cc47aafd69d5d 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java -index f0ec107..6fecd40 100644 +index f0ec1078650..6fecd4044ca 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -137,9 +137,11 @@ public class ApplicationsState { @@ -49,5 +49,5 @@ index f0ec107..6fecd40 100644 private int mCurrentUser; -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch b/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch index 304755c..d73ad2b 100644 --- a/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch +++ b/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch @@ -1,7 +1,7 @@ -From 71f429c997955ac1b699b766a5f6b3092c943368 Mon Sep 17 00:00:00 2001 +From 0d250fd420ba2d187e034c5ed9fc23fdc4f915bd Mon Sep 17 00:00:00 2001 From: Kuba Schenk Date: Thu, 1 Dec 2016 21:48:26 +0100 -Subject: [PATCH 28/42] OMS7-N: ApplicationsState: add filter for Substratum +Subject: [PATCH 28/43] OMS7-N: ApplicationsState: add filter for Substratum icon overlays [1/2] This commit allows the framework to handle the filtering of the icon overlays found for OMS. @@ -15,7 +15,7 @@ Change-Id: I594c993977733e67f566ac65df50ad2e1bbdbdd3 1 file changed, 11 insertions(+) diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java -index 6fecd40..d3a6e21 100644 +index 6fecd4044ca..d3a6e217735 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -1325,6 +1325,17 @@ public class ApplicationsState { @@ -37,5 +37,5 @@ index 6fecd40..d3a6e21 100644 private int mCurrentUser; -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch b/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch index 2e89d68..02ebb35 100644 --- a/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch +++ b/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch @@ -1,7 +1,7 @@ -From 4ae81255155c004674774096bbb28006e8cedcb0 Mon Sep 17 00:00:00 2001 +From 2f539aae001de580b824c675c44877c2d736ec56 Mon Sep 17 00:00:00 2001 From: Abdulwahab Isam Date: Fri, 7 Oct 2016 08:30:11 +0300 -Subject: [PATCH 29/42] Themes: Expose QS battery +Subject: [PATCH 29/43] Themes: Expose QS battery This is needed for white themes like Belo. Should function the same with dark themes as well. @@ -12,7 +12,7 @@ Change-Id: I65e3f777a2a2605a06260705f92f8617407d9005 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml -index 8abfcf6..af3acdc 100644 +index 8abfcf6057a..af3acdc5c53 100644 --- a/packages/SystemUI/res/layout/battery_detail.xml +++ b/packages/SystemUI/res/layout/battery_detail.xml @@ -27,7 +27,7 @@ @@ -36,7 +36,7 @@ index 8abfcf6..af3acdc 100644 @*android:color/accent_device_default_light -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch b/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch index 5fac5fe..7f05139 100644 --- a/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch +++ b/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch @@ -1,7 +1,7 @@ -From 8498f45dd03853cc1c83905de81e7a80d282aa10 Mon Sep 17 00:00:00 2001 +From b49dd21cff01d7aeffab3a4815cfe980ab3530de Mon Sep 17 00:00:00 2001 From: bigrushdog Date: Mon, 19 Dec 2016 04:33:31 -0800 -Subject: [PATCH 30/42] OMS: Introduce MODIFY_OVERLAYS permission for user apps +Subject: [PATCH 30/43] OMS: Introduce MODIFY_OVERLAYS permission for user apps This permission will grant the app read and write permissions to access OverlayManagerService. If caller does not posess @@ -16,7 +16,7 @@ Change-Id: Ib6b10b516577f338aee31e759bfd16278f902c20 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 6a5bd39..3ceb17b 100644 +index 6a5bd3946db..3ceb17ba568 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3162,6 +3162,12 @@ @@ -33,7 +33,7 @@ index 6a5bd39..3ceb17b 100644 android:persistent="true" android:hasCode="false" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml -index 8f5f8cf..8313d5d 100755 +index 8f5f8cfa0de..8313d5d0b9c 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1411,6 +1411,11 @@ @@ -49,7 +49,7 @@ index 8f5f8cf..8313d5d 100755 diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index deb9046..e205ce1 100644 +index deb9046a2d4..e205ce1d030 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -36,6 +36,7 @@ import android.content.om.IOverlayManager; @@ -116,5 +116,5 @@ index deb9046..e205ce1 100644 } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch b/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch index 6461a60..308715e 100644 --- a/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch +++ b/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch @@ -1,7 +1,7 @@ -From 390ed2ae95bba5ce8097c8561ddc846a45498563 Mon Sep 17 00:00:00 2001 +From 8e1d7f093f56599bdd4fcdb4af48a58692d50d84 Mon Sep 17 00:00:00 2001 From: daveyannihilation Date: Sun, 1 Jan 2017 01:47:53 -0700 -Subject: [PATCH 31/42] SystemUI: Expose switch bar title +Subject: [PATCH 31/43] SystemUI: Expose switch bar title This is needed for the power notifications switchbar in SystemUI Tuner, amongst other things. @@ -13,7 +13,7 @@ Change-Id: I86f04840c2be46519509556b8d0061cefe26f631 create mode 100644 packages/SystemUI/res/values/projekt_styles.xml diff --git a/packages/SystemUI/res/layout/switch_bar.xml b/packages/SystemUI/res/layout/switch_bar.xml -index 41cdb78..344c5aa 100644 +index 41cdb78392a..344c5aa0531 100644 --- a/packages/SystemUI/res/layout/switch_bar.xml +++ b/packages/SystemUI/res/layout/switch_bar.xml @@ -33,8 +33,7 @@ @@ -28,7 +28,7 @@ index 41cdb78..344c5aa 100644 diff --git a/packages/SystemUI/res/values/projekt_styles.xml b/packages/SystemUI/res/values/projekt_styles.xml new file mode 100644 -index 0000000..f49834b +index 00000000000..f49834bc202 --- /dev/null +++ b/packages/SystemUI/res/values/projekt_styles.xml @@ -0,0 +1,24 @@ @@ -57,5 +57,5 @@ index 0000000..f49834b + + -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0032-doze-allow-grayscale-even-if-invert-boolean-is-false.patch b/patches/frameworks/base/0032-doze-allow-grayscale-even-if-invert-boolean-is-false.patch index be4d1a5..e9d0356 100644 --- a/patches/frameworks/base/0032-doze-allow-grayscale-even-if-invert-boolean-is-false.patch +++ b/patches/frameworks/base/0032-doze-allow-grayscale-even-if-invert-boolean-is-false.patch @@ -1,7 +1,7 @@ -From db9283d815f37230d65f5559d71e41c47a7ec70f Mon Sep 17 00:00:00 2001 +From 4c0ab9a46b9b58c14f7cbebd1bc6609644544caf Mon Sep 17 00:00:00 2001 From: Daniel Koman Date: Wed, 28 Sep 2016 15:28:26 +0200 -Subject: [PATCH 32/42] doze: allow grayscale even if invert boolean is false +Subject: [PATCH 32/43] doze: allow grayscale even if invert boolean is false for dark themes, we are setting the config boolean for inverting doze notifications to false. in addition to preventing @@ -17,7 +17,7 @@ Change-Id: Ifc5efbccbeb02910684b76793721b10f1d64f870 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java -index 605f381..16d46c0 100644 +index 605f381e9e2..16d46c0362e 100644 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java @@ -92,7 +92,7 @@ public class ViewInvertHelper { @@ -41,5 +41,5 @@ index 605f381..16d46c0 100644 public void setInverted(boolean invert, boolean fade, long delay) { -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0033-Expose-external-qs-tile-tint-color.patch b/patches/frameworks/base/0033-Expose-external-qs-tile-tint-color.patch index 0ac1c70..1524972 100644 --- a/patches/frameworks/base/0033-Expose-external-qs-tile-tint-color.patch +++ b/patches/frameworks/base/0033-Expose-external-qs-tile-tint-color.patch @@ -1,7 +1,7 @@ -From 04d7ccb0b960f83742a9ade448bfacdff1a9a1d0 Mon Sep 17 00:00:00 2001 +From dad931d271ca8b49e59b5b1fa37ce0086ac8decb Mon Sep 17 00:00:00 2001 From: Alex Cruz Date: Tue, 24 Jan 2017 11:14:46 +0100 -Subject: [PATCH 33/42] Expose external qs tile tint color +Subject: [PATCH 33/43] Expose external qs tile tint color This should allow themers to get around issues like this (see pic below) @@ -14,7 +14,7 @@ Change-Id: If6dbf9ab29f8007d85a3c45524b1cf4ba1b032fb 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml -index 83b8524..e31d124 100644 +index 83b852416e1..e31d1244ac8 100644 --- a/packages/SystemUI/res/values/projekt_colors.xml +++ b/packages/SystemUI/res/values/projekt_colors.xml @@ -30,4 +30,6 @@ @@ -25,7 +25,7 @@ index 83b8524..e31d124 100644 + @android:color/white diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java -index 0cd6490..6fabc61 100644 +index 0cd6490614b..6fabc6101ca 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -177,7 +177,7 @@ public class TileQueryHelper { @@ -38,5 +38,5 @@ index 0cd6490..6fabc61 100644 addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext); } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0034-graphics-ADB-N-icon-compatible-with-OMS7.patch b/patches/frameworks/base/0034-graphics-ADB-N-icon-compatible-with-OMS7.patch index 608f4f2..54fc8df 100644 --- a/patches/frameworks/base/0034-graphics-ADB-N-icon-compatible-with-OMS7.patch +++ b/patches/frameworks/base/0034-graphics-ADB-N-icon-compatible-with-OMS7.patch @@ -1,7 +1,7 @@ -From 4e78d8758ded305e9ce4c532aa702f8ed3adc439 Mon Sep 17 00:00:00 2001 +From 55e625ec43be7e32320b83b5f71b4e48914a6665 Mon Sep 17 00:00:00 2001 From: George G Date: Thu, 2 Feb 2017 01:52:27 +0200 -Subject: [PATCH 34/42] graphics: ADB "N" icon compatible with OMS7 +Subject: [PATCH 34/43] graphics: ADB "N" icon compatible with OMS7 It's the same problem as the booleans again. This time, it affected the adb "N" icon in the statusbar. This commit should fix this. @@ -28,7 +28,7 @@ Change-Id: Ibab2ce1571360a9e03043d1bf3144c89e54e1947 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java -index 2b950d3..fb26bee 100644 +index 2b950d3d5c5..fb26bee68fa 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -294,7 +294,7 @@ public final class Icon implements Parcelable { @@ -41,5 +41,5 @@ index 2b950d3..fb26bee 100644 final PackageManager pm = context.getPackageManager(); try { -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0035-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch b/patches/frameworks/base/0035-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch index 1501806..bcf0d1a 100644 --- a/patches/frameworks/base/0035-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch +++ b/patches/frameworks/base/0035-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch @@ -1,7 +1,7 @@ -From 024501f8e0b8b938837c12dddffff97119a459cd Mon Sep 17 00:00:00 2001 +From 4b89338af9380f318e2bfc9a050f3092089c1371 Mon Sep 17 00:00:00 2001 From: Alex Cruz Date: Sat, 4 Feb 2017 14:13:26 +0100 -Subject: [PATCH 35/42] Set external QS tiles tint mode to SRC_ATOP +Subject: [PATCH 35/43] Set external QS tiles tint mode to SRC_ATOP While the external qs tile tint color was exposed, we had the same problem we had with the external icons in Settings which is if a themer set the color @@ -19,7 +19,7 @@ Change-Id: I6d577573dd494d61a3e87abebd919b02a481db56 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java -index 6fabc61..dbdb614 100644 +index 6fabc6101ca..dbdb614c8e1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -23,6 +23,7 @@ import android.content.Context; @@ -39,5 +39,5 @@ index 6fabc61..dbdb614 100644 addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext); } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0036-Themes-Expose-Keyguard-affordance-circle-background.patch b/patches/frameworks/base/0036-Themes-Expose-Keyguard-affordance-circle-background.patch index 992e2b5..b274b4f 100644 --- a/patches/frameworks/base/0036-Themes-Expose-Keyguard-affordance-circle-background.patch +++ b/patches/frameworks/base/0036-Themes-Expose-Keyguard-affordance-circle-background.patch @@ -1,7 +1,7 @@ -From 6616f098932b704bacf8b26909c0a9be06e317d1 Mon Sep 17 00:00:00 2001 +From 78d5f20cc344cd4513fece8b6fd6483f32a5e451 Mon Sep 17 00:00:00 2001 From: Branden M Date: Wed, 1 Feb 2017 22:22:45 -0600 -Subject: [PATCH 36/42] Themes: Expose Keyguard affordance circle background +Subject: [PATCH 36/43] Themes: Expose Keyguard affordance circle background Change-Id: Id4a078cdbc944fa0c0736103045a0382d49ecb80 --- @@ -10,7 +10,7 @@ Change-Id: Id4a078cdbc944fa0c0736103045a0382d49ecb80 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml -index e31d124..e8f8e50 100644 +index e31d1244ac8..e8f8e502845 100644 --- a/packages/SystemUI/res/values/projekt_colors.xml +++ b/packages/SystemUI/res/values/projekt_colors.xml @@ -32,4 +32,6 @@ @@ -21,7 +21,7 @@ index e31d124..e8f8e50 100644 + @android:color/white diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java -index b94df1d..3d661b7 100644 +index b94df1d5819..3d661b781b8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java @@ -131,7 +131,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette @@ -34,5 +34,5 @@ index b94df1d..3d661b7 100644 mNormalColor = 0xffffffff; -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0037-Notification-tint-add-optional-findContrastColor-alg.patch b/patches/frameworks/base/0037-Notification-tint-add-optional-findContrastColor-alg.patch index 5aa1d34..cf61d4d 100644 --- a/patches/frameworks/base/0037-Notification-tint-add-optional-findContrastColor-alg.patch +++ b/patches/frameworks/base/0037-Notification-tint-add-optional-findContrastColor-alg.patch @@ -1,7 +1,7 @@ -From 287c5b7bcf62698809e8aa031946039e64969206 Mon Sep 17 00:00:00 2001 +From d80d82ac7eff24519929a8847b2599c0633a1314 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 Feb 2017 12:00:54 +0100 -Subject: [PATCH 37/42] Notification tint: add optional findContrastColor +Subject: [PATCH 37/43] Notification tint: add optional findContrastColor algorithm for dark backgrounds Overlay config_useDarkBgNotificationIconTextTinting to enable dark bg tinting @@ -14,7 +14,7 @@ Change-Id: I80cb01caf185c8fcd012ba409eacfa91e887c511 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/util/NotificationColorUtil.java b/core/java/com/android/internal/util/NotificationColorUtil.java -index 4748e6f..bbc9a24 100644 +index 4748e6fb19f..bbc9a24b1ed 100644 --- a/core/java/com/android/internal/util/NotificationColorUtil.java +++ b/core/java/com/android/internal/util/NotificationColorUtil.java @@ -37,6 +37,8 @@ import android.text.style.TextAppearanceSpan; @@ -117,7 +117,7 @@ index 4748e6f..bbc9a24 100644 if (color != resolvedColor) { if (DEBUG){ diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml -index 5234959..8cf5666 100644 +index 5234959fc9e..8cf5666a7e4 100644 --- a/core/res/res/values/projekt_config.xml +++ b/core/res/res/values/projekt_config.xml @@ -27,4 +27,8 @@ @@ -130,7 +130,7 @@ index 5234959..8cf5666 100644 + diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml -index 16a5728..faa71e0 100644 +index 16a5728e6c9..faa71e064e6 100644 --- a/core/res/res/values/projekt_symbols.xml +++ b/core/res/res/values/projekt_symbols.xml @@ -19,6 +19,7 @@ @@ -142,5 +142,5 @@ index 16a5728..faa71e0 100644 -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0038-OMS7-Rootless-Security-Update-Preparation-for-March-.patch b/patches/frameworks/base/0038-OMS7-Rootless-Security-Update-Preparation-for-March-.patch index f2fb2fe..b195d4d 100644 --- a/patches/frameworks/base/0038-OMS7-Rootless-Security-Update-Preparation-for-March-.patch +++ b/patches/frameworks/base/0038-OMS7-Rootless-Security-Update-Preparation-for-March-.patch @@ -1,7 +1,7 @@ -From d0d8be2b9081d7feb3cf57864db302939def2df7 Mon Sep 17 00:00:00 2001 +From 23b7bb57097951ee0aed4a51ce750b18aae952f2 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Wed, 22 Feb 2017 22:55:15 -0500 -Subject: [PATCH 38/42] OMS7: Rootless Security Update Preparation for March +Subject: [PATCH 38/43] OMS7: Rootless Security Update Preparation for March 2017 Change-Id: I93f7917eebf9f86590eb9c00841460d236702cb3 @@ -12,7 +12,7 @@ Change-Id: I93f7917eebf9f86590eb9c00841460d236702cb3 delete mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index e205ce1..ac56985 100644 +index e205ce1d030..ac56985ce54 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -528,14 +528,6 @@ public final class OverlayManagerService extends SystemService { @@ -32,7 +32,7 @@ index e205ce1..ac56985 100644 enforceDumpPermission("dump"); diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java deleted file mode 100644 -index 44004c1..0000000 +index 44004c140a4..00000000000 --- a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java +++ /dev/null @@ -1,269 +0,0 @@ @@ -306,5 +306,5 @@ index 44004c1..0000000 - } -} -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0039-OMS-Add-hide-annotation-to-MODIFY_OVERLAYS-permissio.patch b/patches/frameworks/base/0039-OMS-Add-hide-annotation-to-MODIFY_OVERLAYS-permissio.patch index 0239ff4..46cac2d 100644 --- a/patches/frameworks/base/0039-OMS-Add-hide-annotation-to-MODIFY_OVERLAYS-permissio.patch +++ b/patches/frameworks/base/0039-OMS-Add-hide-annotation-to-MODIFY_OVERLAYS-permissio.patch @@ -1,7 +1,7 @@ -From c60265bfa86a7c58902cee42ca600e33e628d6ab Mon Sep 17 00:00:00 2001 +From 89140e303a2f18d1ba7ff821c591a59a14c3eca8 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Mon, 27 Feb 2017 15:16:18 -0500 -Subject: [PATCH 39/42] OMS: Add hide annotation to MODIFY_OVERLAYS permission +Subject: [PATCH 39/43] OMS: Add hide annotation to MODIFY_OVERLAYS permission * Modifications in this file affect the public API, so we must hide our additions to build in release mode @@ -13,7 +13,7 @@ Signed-off-by: Evan Anderson 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 3ceb17b..4a7dd78 100644 +index 3ceb17ba568..4a7dd780c15 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3162,7 +3162,8 @@ @@ -27,5 +27,5 @@ index 3ceb17b..4a7dd78 100644 android:label="@string/permlab_modifyOverlays" android:description="@string/permdesc_modifyOverlays" -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0040-FWB-Give-power-dialogs-own-set-of-volume-icons-for-t.patch b/patches/frameworks/base/0040-FWB-Give-power-dialogs-own-set-of-volume-icons-for-t.patch index e080175..58de84d 100644 --- a/patches/frameworks/base/0040-FWB-Give-power-dialogs-own-set-of-volume-icons-for-t.patch +++ b/patches/frameworks/base/0040-FWB-Give-power-dialogs-own-set-of-volume-icons-for-t.patch @@ -1,7 +1,7 @@ -From 9927bcd8b73bbed7a16f852de3957ab4753a68db Mon Sep 17 00:00:00 2001 +From 05d4f4bd82e6f07b455d0aa3508760bddfc372e8 Mon Sep 17 00:00:00 2001 From: Bryan Owens Date: Mon, 27 Feb 2017 19:06:31 -0600 -Subject: [PATCH 40/42] FWB: Give power dialogs own set of volume icons for +Subject: [PATCH 40/43] FWB: Give power dialogs own set of volume icons for themes Change-Id: I5add336c06a83b162dfd0832dfabfb06a2827421 @@ -18,7 +18,7 @@ Signed-off-by: Bryan Owens diff --git a/core/res/res/drawable/ic_power_audio_ring_notif.xml b/core/res/res/drawable/ic_power_audio_ring_notif.xml new file mode 100644 -index 0000000..6b2dcc4 +index 00000000000..6b2dcc4a675 --- /dev/null +++ b/core/res/res/drawable/ic_power_audio_ring_notif.xml @@ -0,0 +1,20 @@ @@ -44,7 +44,7 @@ index 0000000..6b2dcc4 + diff --git a/core/res/res/drawable/ic_power_audio_ring_notif_mute.xml b/core/res/res/drawable/ic_power_audio_ring_notif_mute.xml new file mode 100644 -index 0000000..dab250c +index 00000000000..dab250cc2d8 --- /dev/null +++ b/core/res/res/drawable/ic_power_audio_ring_notif_mute.xml @@ -0,0 +1,20 @@ @@ -70,7 +70,7 @@ index 0000000..dab250c + diff --git a/core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml b/core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml new file mode 100644 -index 0000000..f278ccb +index 00000000000..f278ccbf980 --- /dev/null +++ b/core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml @@ -0,0 +1,20 @@ @@ -95,7 +95,7 @@ index 0000000..f278ccb + + diff --git a/core/res/res/layout/global_actions_silent_mode.xml b/core/res/res/layout/global_actions_silent_mode.xml -index a358623..3fe7bbe 100644 +index a3586232a15..3fe7bbec960 100644 --- a/core/res/res/layout/global_actions_silent_mode.xml +++ b/core/res/res/layout/global_actions_silent_mode.xml @@ -37,7 +37,7 @@ @@ -126,5 +126,5 @@ index a358623..3fe7bbe 100644 android:duplicateParentState="true" android:background="@drawable/silent_mode_indicator" -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0041-base-Force-authorize-all-calling-packages-by-Masquer.patch b/patches/frameworks/base/0041-base-Force-authorize-all-calling-packages-by-Masquer.patch index 1f4b37c..ba7321a 100644 --- a/patches/frameworks/base/0041-base-Force-authorize-all-calling-packages-by-Masquer.patch +++ b/patches/frameworks/base/0041-base-Force-authorize-all-calling-packages-by-Masquer.patch @@ -1,7 +1,7 @@ -From 682f792168d7d1ac4d5ea719eca6fd5e4d01b43d Mon Sep 17 00:00:00 2001 +From b7c3ea5a70af8680e8ff6ced1f1accc819e2d7a7 Mon Sep 17 00:00:00 2001 From: George G Date: Sat, 25 Feb 2017 17:32:18 +0200 -Subject: [PATCH 41/42] base: Force authorize all calling packages by +Subject: [PATCH 41/43] base: Force authorize all calling packages by Masquerade (2/3) Change-Id: Iaf354c4d891acf9f5e19767223e4f9860a07338f @@ -10,10 +10,10 @@ Change-Id: Iaf354c4d891acf9f5e19767223e4f9860a07338f 1 file changed, 6 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 7fe6034..4d3e6c9 100644 +index dd2a5dea961..a773e190113 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -6572,6 +6572,12 @@ public final class Settings { +@@ -6564,6 +6564,12 @@ public final class Settings { public static final String VOLUME_LINK_NOTIFICATION = "volume_link_notification"; /** @@ -27,5 +27,5 @@ index 7fe6034..4d3e6c9 100644 * * NOTE: Settings are backed up and restored in the order they appear -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0042-ThemeSafety-Introduce-App-Crash-Intent.patch b/patches/frameworks/base/0042-ThemeSafety-Introduce-App-Crash-Intent.patch index fadcc3d..06bddd9 100644 --- a/patches/frameworks/base/0042-ThemeSafety-Introduce-App-Crash-Intent.patch +++ b/patches/frameworks/base/0042-ThemeSafety-Introduce-App-Crash-Intent.patch @@ -1,7 +1,7 @@ -From 1e00bba63c5b6facec5a8beef1bb39863b251183 Mon Sep 17 00:00:00 2001 +From bc0a751b1ca020aba84331eebdaf0b3fbfb0e5dd Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Thu, 9 Mar 2017 13:28:22 +0100 -Subject: [PATCH 42/42] ThemeSafety: Introduce App Crash Intent +Subject: [PATCH 42/43] ThemeSafety: Introduce App Crash Intent The intent received by substratum and it will disable all enabled overlays. @@ -12,7 +12,7 @@ Change-Id: Ifabd57c2ea71ca93ecc2959ce09ccde3e91782dd 1 file changed, 8 insertions(+) diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java -index 0e2fa23..1ff1cdc 100644 +index 0e2fa23f95f..1ff1cdc0081 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -365,6 +365,14 @@ class AppErrors { @@ -31,5 +31,5 @@ index 0e2fa23..1ff1cdc 100644 int res = result.get(); -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0043-Expose-Screenshot-flash-and-background-colors.patch b/patches/frameworks/base/0043-Expose-Screenshot-flash-and-background-colors.patch new file mode 100644 index 0000000..61929b0 --- /dev/null +++ b/patches/frameworks/base/0043-Expose-Screenshot-flash-and-background-colors.patch @@ -0,0 +1,52 @@ +From 5a447a3f7c303a10dcb9fdd159f0d3449d42e292 Mon Sep 17 00:00:00 2001 +From: Ezio Lacandia Bijelkic +Date: Tue, 7 Mar 2017 23:33:40 +0100 +Subject: [PATCH 43/43] Expose Screenshot flash and background colors + +Keep in mind that Background color already gets 0.5f opacity in the +GlobalScreenshot class (BACKGROUND_ALPHA with some math). +For the flash you can use any color value instead (full opacity or not). + +Change-Id: I6ac51358f7f5278d742849ebc49f580554f069cd +--- + packages/SystemUI/res/layout/global_screenshot.xml | 4 ++-- + packages/SystemUI/res/values/projekt_colors.xml | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/packages/SystemUI/res/layout/global_screenshot.xml b/packages/SystemUI/res/layout/global_screenshot.xml +index 59952e09555..c74c69ba8e9 100644 +--- a/packages/SystemUI/res/layout/global_screenshot.xml ++++ b/packages/SystemUI/res/layout/global_screenshot.xml +@@ -19,7 +19,7 @@ + + + @android:color/white + + @android:color/white ++ ++ @android:color/white ++ @android:color/black + +-- +2.11.1 +