From: LuK1337 Date: Wed, 15 Feb 2017 14:01:14 +0000 (+0100) Subject: Update for cm-14.1-cafrebase X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5596c080994c3947d3981b09a18b751654c794d2;p=GitHub%2FStricted%2Fandroid_vendor_extra.git Update for cm-14.1-cafrebase --- 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 342173e..49866ce 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,4 +1,4 @@ -From 75d5463e848764c3255c32d126415faceca62023 Mon Sep 17 00:00:00 2001 +From b43513fd7b0692aa757e1e6b1d299ffe1875dcdd 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/38] OMS7-N: Support tagging resources as OK to overlay @@ -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 fdd0caf..edc625b 100644 +index 7d1424ef687..4c2f94d63ab 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 fdd0caf..edc625b 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 919e42c..8a1e4da 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,4 +1,4 @@ -From 90815d5667efdc258011508a5599a45bd3d66756 Mon Sep 17 00:00:00 2001 +From 37fcdce6e621c21cdf1010ca600b7722d5a1bc5a 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/38] OMS7-N: Introduce the OverlayManagerService [2/11] @@ -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 c2f12ef..986be28 100644 +index 2c76dee9754..6a5bd3946db 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -84,6 +84,10 @@ @@ -663,11 +663,11 @@ index c2f12ef..986be28 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,10 +3026,10 @@ 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 583cb23..3892f8f 100644 +index 5a06bb341cd..cfc5a0edd5c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -21444,6 +21444,47 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); +@@ -21450,6 +21450,47 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); return mSettings.wasPackageEverLaunchedLPr(packageName, userId); } } @@ -3078,5 +3078,5 @@ index 583cb23..3892f8f 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 5104306..6d4bb11 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,4 +1,4 @@ -From 2a5bd30d939fd04580f162115ddba6c359290b6f Mon Sep 17 00:00:00 2001 +From ca6a779643bb2b80e14318c8866f6f4970f70a0a 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/38] OMS7-N: Integrate OverlayManagerService into framework @@ -53,8 +53,8 @@ Change-Id: If0b1eaa690c38f9c33f7c8dc981314205a73fa9c core/java/android/content/pm/PackageParser.java | 20 +-- core/java/android/content/pm/PackageUserState.java | 6 + core/jni/android_util_AssetManager.cpp | 95 --------------- - include/androidfw/AssetManager.h | 15 +-- - libs/androidfw/AssetManager.cpp | 104 ---------------- + include/androidfw/AssetManager.h | 14 +-- + libs/androidfw/AssetManager.cpp | 111 ----------------- .../com/android/server/SystemServiceManager.java | 24 ++-- .../android/server/am/ActivityManagerService.java | 51 ++++++++ .../android/server/om/OverlayManagerService.java | 61 +++++----- @@ -62,10 +62,10 @@ Change-Id: If0b1eaa690c38f9c33f7c8dc981314205a73fa9c .../com/android/server/pm/PackageSettingBase.java | 8 +- .../core/java/com/android/server/pm/Settings.java | 4 +- services/java/com/android/server/SystemServer.java | 4 + - 21 files changed, 335 insertions(+), 473 deletions(-) + 21 files changed, 335 insertions(+), 479 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..8d42d2c 100644 +index f2e3333b67d..8d42d2c590c 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..8d42d2c 100644 ai.protect = state.protectedComponents.size() > 0; } diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java -index e64e4c4..4b276fb 100644 +index e64e4c4cc5e..4b276fb786f 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; @@ -657,7 +657,7 @@ index e64e4c4..4b276fb 100644 ? new ArraySet(o.protectedComponents) : null; visibleComponents = o.visibleComponents != null 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, @@ -770,7 +770,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 914ac3d..651765b 100644 +index 2d5f4c2f90b..c4991032b73 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -238,12 +238,10 @@ public: @@ -816,18 +816,17 @@ index 914ac3d..651765b 100644 static Mutex gLock; static DefaultKeyedVector > gOpen; }; -@@ -356,9 +346,6 @@ private: - static String8 getPathName(const char* path); +@@ -357,8 +347,6 @@ private: bool isUpToDate(); -- + - void addOverlay(const String8& path, const asset_path& overlay); - bool getOverlay(const String8& path, size_t idx, asset_path* out) const; - + void closeZipFromPath(const String8& zip); private: void closeZip(int idx); diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index edc625b..924b230 100644 +index 4c2f94d63ab..b9954573d79 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -214,15 +214,6 @@ bool AssetManager::addAssetPath( @@ -873,7 +872,7 @@ index edc625b..924b230 100644 sharedRes = const_cast(this)-> mZipSet.setZipResourceTable(ap.path, sharedRes); } -@@ -772,58 +750,6 @@ Asset* AssetManager::openIdmapLocked(const struct asset_path& ap) const +@@ -772,65 +750,6 @@ Asset* AssetManager::openIdmapLocked(const struct asset_path& ap) const return ass; } @@ -919,9 +918,16 @@ index edc625b..924b230 100644 - sharedRes->add(oass, oidmap, offset + 1, false); - const_cast(this)->mAssetPaths.add(oap); - const_cast(this)->mZipSet.addOverlay(targetPackagePath, oap); -- delete oidmap; -- } -- } +- +- oidmap->close(); +- ALOGD("close idmap=%s pid=%d\n", oap.idmap.string(), getpid()); +- } +- +- if (oap.path.find(OVERLAY_DIR) != -1) { +- const_cast(this)->mZipSet.closeZipFromPath(oap.path); +- ALOGD("close: %s and reset entry\n", oap.path.string()); +- } +- } - -#ifndef _WIN32 - TEMP_FAILURE_RETRY(flock(fileno(fin), LOCK_UN)); @@ -932,7 +938,7 @@ index edc625b..924b230 100644 const ResTable& AssetManager::getResources(bool required) const { const ResTable* rt = getResTable(required); -@@ -1962,20 +1888,6 @@ bool AssetManager::SharedZip::isUpToDate() +@@ -1969,20 +1888,6 @@ bool AssetManager::SharedZip::isUpToDate() return mModWhen == modWhen; } @@ -953,7 +959,7 @@ index edc625b..924b230 100644 AssetManager::SharedZip::~SharedZip() { if (kIsDebug) { -@@ -2101,22 +2013,6 @@ bool AssetManager::ZipSet::isUpToDate() +@@ -2124,22 +2029,6 @@ bool AssetManager::ZipSet::isUpToDate() return true; } @@ -977,7 +983,7 @@ index edc625b..924b230 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 @@ @@ -1025,7 +1031,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 e31b409..2822dc9 100644 +index e31b409598f..2822dc93d2b 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19297,6 +19297,57 @@ public final class ActivityManagerService extends ActivityManagerNative @@ -1087,7 +1093,7 @@ index e31b409..2822dc9 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 { @@ -1159,10 +1165,10 @@ 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 3892f8f..f700522 100644 +index cfc5a0edd5c..89549231806 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -399,17 +399,16 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -400,17 +400,16 @@ public class PackageManagerService extends IPackageManager.Stub { static final int SCAN_UPDATE_TIME = 1<<6; static final int SCAN_DEFER_DEX = 1<<7; static final int SCAN_BOOTING = 1<<8; @@ -1190,7 +1196,7 @@ index 3892f8f..f700522 100644 private static final int[] EMPTY_INT_ARRAY = new int[0]; -@@ -600,10 +599,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -601,10 +600,6 @@ public class PackageManagerService extends IPackageManager.Stub { final ArrayMap> mKnownCodebase = new ArrayMap>(); @@ -1201,7 +1207,7 @@ index 3892f8f..f700522 100644 /** * Tracks new system packages [received in an OTA] that we expect to * find updated user-installed versions. Keys are package name, values -@@ -2342,8 +2337,8 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -2344,8 +2339,8 @@ public class PackageManagerService extends IPackageManager.Stub { File vendorOverlayDir = new File(VENDOR_OVERLAY_DIR); scanDirTracedLI(vendorOverlayDir, mDefParseFlags | PackageParser.PARSE_IS_SYSTEM @@ -1212,7 +1218,7 @@ index 3892f8f..f700522 100644 // Find base frameworks (resource packages without code). scanDirTracedLI(frameworkDir, mDefParseFlags -@@ -2400,7 +2395,7 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -2402,7 +2397,7 @@ public class PackageManagerService extends IPackageManager.Stub { // Collect overlay in /system/vendor scanDirLI(new File(RegionalizationSystemDir, "vendor/overlay"), PackageParser.PARSE_IS_SYSTEM | PackageParser.PARSE_IS_SYSTEM_DIR, @@ -1221,7 +1227,7 @@ index 3892f8f..f700522 100644 } } -@@ -6723,60 +6718,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -6729,60 +6724,6 @@ public class PackageManagerService extends IPackageManager.Stub { return finalList; } @@ -1282,7 +1288,7 @@ index 3892f8f..f700522 100644 private void scanDirTracedLI(File dir, final int parseFlags, int scanFlags, long currentTime) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanDir"); try { -@@ -6964,10 +6905,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -6970,10 +6911,6 @@ public class PackageManagerService extends IPackageManager.Stub { pp.setOnlyPowerOffAlarmApps(mOnlyPowerOffAlarm); pp.setDisplayMetrics(mMetrics); @@ -1293,7 +1299,7 @@ index 3892f8f..f700522 100644 Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parsePackage"); final PackageParser.Package pkg; try { -@@ -8200,7 +8137,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -8206,7 +8143,6 @@ public class PackageManagerService extends IPackageManager.Stub { pkg.applicationInfo.privateFlags &= ~ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE; } @@ -1301,7 +1307,7 @@ index 3892f8f..f700522 100644 if ((policyFlags&PackageParser.PARSE_IS_PRIVILEGED) != 0) { pkg.applicationInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; -@@ -8795,7 +8731,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -8801,7 +8737,6 @@ public class PackageManagerService extends IPackageManager.Stub { // writer Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "updateSettings"); @@ -1309,7 +1315,7 @@ index 3892f8f..f700522 100644 synchronized (mPackages) { // We don't expect installation to fail beyond this point -@@ -9142,36 +9077,10 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -9148,36 +9083,10 @@ public class PackageManagerService extends IPackageManager.Stub { } pkgSetting.setTimeStamp(scanFileTime); @@ -1346,7 +1352,7 @@ index 3892f8f..f700522 100644 return pkg; } -@@ -16618,7 +16527,7 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -16624,7 +16533,7 @@ public class PackageManagerService extends IPackageManager.Stub { false /*hidden*/, false /*suspended*/, null, null, null, false /*blockUninstall*/, ps.readUserState(nextUserId).domainVerificationStatus, 0, @@ -1355,7 +1361,7 @@ index 3892f8f..f700522 100644 } } -@@ -21476,14 +21385,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); +@@ -21482,14 +21391,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); @Override public void setResourceDirs(int userId, String packageName, String[] resourceDirs) { @@ -1378,7 +1384,7 @@ index 3892f8f..f700522 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..18c79cd 100644 +index 75427a8b75a..18c79cdda69 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 @@ -1418,7 +1424,7 @@ index 75427a8..18c79cd 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..2b36e0e 100755 +index 285b5bbf3ec..2b36e0e0e4d 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 { @@ -1447,10 +1453,10 @@ index 285b5bb..2b36e0e 100755 } else if (tagName.equals("preferred-activities")) { readPreferredActivitiesLPw(parser, userId); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java -index 3e16338..010aaa1 100644 +index 6f2141708ed..ab425c05e95 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java -@@ -84,6 +84,7 @@ import com.android.server.media.projection.MediaProjectionManagerService; +@@ -85,6 +85,7 @@ import com.android.server.media.projection.MediaProjectionManagerService; import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkStatsService; import com.android.server.notification.NotificationManagerService; @@ -1458,7 +1464,7 @@ index 3e16338..010aaa1 100644 import com.android.server.os.RegionalizationService; import com.android.server.os.SchedulingPolicyService; import com.android.server.pm.BackgroundDexOptService; -@@ -530,6 +531,9 @@ public final class SystemServer { +@@ -531,6 +532,9 @@ public final class SystemServer { // Set up the Application instance for the system process and get started. mActivityManagerService.setSystemProcess(); @@ -1469,5 +1475,5 @@ index 3e16338..010aaa1 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 5ce4094..9b3130e 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,4 +1,4 @@ -From 06912868733feadee85507d9f40ede2468a9a496 Mon Sep 17 00:00:00 2001 +From a1d27bf6ba22b9189350bf26df2918ff2ac551c8 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/38] OMS7-N: Set EXTRA_REPLACING correctly in @@ -35,10 +35,10 @@ 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 f700522..7277f6a 100644 +index 89549231806..3abcdbb19d2 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -1714,6 +1714,7 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -1715,6 +1715,7 @@ public class PackageManagerService extends IPackageManager.Stub { // Send added for users that don't see the package for the first time if (update) { @@ -47,5 +47,5 @@ index f700522..7277f6a 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 31ebb89..096abf5 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,4 +1,4 @@ -From ee6f42041d3c77be1151d82898ee5626633cf9fa Mon Sep 17 00:00:00 2001 +From d2d59caef4a066b8149b09d0bd4e25ac4e01732e 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/38] OMS7-N: idmap: suppress print for padded resources @@ -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 9eb37d8..3658556 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,4 +1,4 @@ -From a2ce720b5bfca010dc28ab9cd79e9a8d94f981b3 Mon Sep 17 00:00:00 2001 +From a25413bc2f0537766385bbfbfa2ddad6c10b7e3d 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/38] OMS7-N: Fix memory leak during idmap creation [6/11] @@ -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 924b230..c501e8b 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 924b230..c501e8b 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 209f9e3..bf3eb28 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,4 +1,4 @@ -From b14c245ca8e1b2fa9665ef8cde29eeafaeba282f Mon Sep 17 00:00:00 2001 +From e8847e7d2ddacae26e0a571b2c2a2a106a9b4f1f 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/38] OMS7-N: installd: add command 'rmidmap' [7/11] @@ -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 fd22568..8444337 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,4 +1,4 @@ -From 5e8fc3854ee67ed15983c460b390d0cff1dde775 Mon Sep 17 00:00:00 2001 +From 961527ef5940fdf23c7c4311981c835b5fd0f699 Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Wed, 26 Jan 2011 23:28:43 -0800 Subject: [PATCH 08/38] OMS7-N: Disable Zygote preloaded drawables [8/11] @@ -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 16c58d4..807cd02 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,4 +1,4 @@ -From fc7d694af82449a4d4a3456ffd486a5afa30a2ef Mon Sep 17 00:00:00 2001 +From 881efe212818d0cd62fb90f41f15bd368c7cc58d Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Sun, 19 Jun 2016 10:37:13 -0400 Subject: [PATCH 09/38] OMS7-N: Persistence on boot through @@ -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 abf34be..eb9d9d7 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,4 +1,4 @@ -From c41b5f7552e5ef1f221d1f755b37501037463c66 Mon Sep 17 00:00:00 2001 +From accdb618c530796534fc4b84e69fc81ea6d98f07 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Thu, 27 Oct 2016 07:08:00 +0200 Subject: [PATCH 10/38] OMS7-N: Do not enforce code policy limiting overlay @@ -10,10 +10,10 @@ 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 7277f6a..46679e5 100644 +index 3abcdbb19d2..faaff1f08a2 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -8143,10 +8143,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -8149,10 +8149,6 @@ public class PackageManagerService extends IPackageManager.Stub { pkg.applicationInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; } @@ -25,5 +25,5 @@ index 7277f6a..46679e5 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 c155b92..317b504 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,4 +1,4 @@ -From 61a04ac0c542521026b925d35faf4244e6ea2810 Mon Sep 17 00:00:00 2001 +From d3a24aa7becbcc6ce61d0e13a07b87525d0769fd Mon Sep 17 00:00:00 2001 From: Jacob McSwain Date: Sun, 26 Jun 2016 15:21:52 -0500 Subject: [PATCH 11/38] OMS7-N: Implement multi-target enable/disable and @@ -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 618f62d..b832530 100644 --- a/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch +++ b/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch @@ -1,4 +1,4 @@ -From 68105cc059781ce4d0948cfe6d34511da24079d2 Mon Sep 17 00:00:00 2001 +From e1469be527249a4015953afaef58ea65b96ab673 Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Fri, 9 Dec 2016 10:47:17 -0700 Subject: [PATCH 12/38] Themes: Expose resolver hardcoded colors @@ -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 a5b2fc9..b7660db 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,4 +1,4 @@ -From 0e81796b338e5009df8049d0ad4c4b2095f4c807 Mon Sep 17 00:00:00 2001 +From 3871ec03b79a47e40ed9405edbdf502500603dff Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Tue, 17 Nov 2015 18:57:11 -0500 Subject: [PATCH 13/38] Themes: Allow Immersive cling colors to be fully themed @@ -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 64aa7f6..7ef7eaf 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,4 +1,4 @@ -From 16db866f5fdb07a80c87e733af4952ff2484a4f3 Mon Sep 17 00:00:00 2001 +From 2d1f47489f89e1d16ba15f126cabf79b592e64e8 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Mon, 23 Nov 2015 23:49:15 -0500 Subject: [PATCH 14/38] Themes: Allow Permission Icons to be fully themed @@ -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 52cfce0..9945da4 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,4 +1,4 @@ -From 91025c7450fc618d35d40d6581172a262d73bd22 Mon Sep 17 00:00:00 2001 +From 877df2f3564c0511e5a8ba7b9b2c91c89d2a6e01 Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Thu, 14 Apr 2016 10:19:13 +0700 Subject: [PATCH 15/38] Themes: Allow Navbar ripple color to be themed @@ -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 c3ad488..7c8bf64 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,4 +1,4 @@ -From 2220bc8b7603b3223e73cd4303151d56eda5948b Mon Sep 17 00:00:00 2001 +From aff3bc9220590e6cced7b8cfaefae6bb005843c6 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Sun, 18 Sep 2016 21:33:18 +0700 Subject: [PATCH 16/38] SystemUI: Expose QS edit item decoration background @@ -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 2f79692..35c3023 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,4 +1,4 @@ -From 78783e0ed0a5eb8c3676d152892bf5eebf659317 Mon Sep 17 00:00:00 2001 +From 5772f09122cb0bd56cbd7121a3fd4d2389ef8102 Mon Sep 17 00:00:00 2001 From: Simao Gomes Viana Date: Fri, 25 Nov 2016 20:50:29 +0100 Subject: [PATCH 17/38] Allow custom alpha for notification shade bg color @@ -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 3854ba4..b0e6c93 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,4 +1,4 @@ -From c6782421d455174ac3b03e994505947471726194 Mon Sep 17 00:00:00 2001 +From 8a1870f105abf0e2236e96fc315e7851c5af0d9b Mon Sep 17 00:00:00 2001 From: "Niklas Schnettler (Sh4dowSoul)" Date: Wed, 5 Oct 2016 18:07:43 +0200 Subject: [PATCH 18/38] Themes: Expose various QuickSettings text colors @@ -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 68fa9b3..d9a2078 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,4 +1,4 @@ -From 665ebd4404843764b9a98c3fef7a2e6007695d40 Mon Sep 17 00:00:00 2001 +From 3a0db1599e4075a7e9b08d0926e699da38378f45 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Sat, 27 Aug 2016 10:56:46 -0400 Subject: [PATCH 19/38] Notifications: Expose a bool to disable dynamic colors @@ -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 6df4637..38b9274 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,4 +1,4 @@ -From 85f0110784ed2b55e062ca3c35d05480dc78ab8a Mon Sep 17 00:00:00 2001 +From e484b9a479870311436fa12bc6df4494a9822525 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 14 Nov 2016 14:49:47 +0200 Subject: [PATCH 20/38] Notification dynamic colors bool compatible with OMS7 @@ -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 0014548..ac03ef9 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,4 +1,4 @@ -From a5c8355f8999d9c4868bb22018ed8d6d9e25ad48 Mon Sep 17 00:00:00 2001 +From acc1fe734b3cf4343191dad13cef6f651f9d044a Mon Sep 17 00:00:00 2001 From: Daniel Koman Date: Fri, 17 Apr 2015 11:56:28 -0600 Subject: [PATCH 21/38] Allow prevention of doze notification color inversion @@ -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 3768431..b367c90 100644 --- a/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch +++ b/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch @@ -1,4 +1,4 @@ -From 367e7476f68b80c265bedb92a019cb5fd7c8dfc7 Mon Sep 17 00:00:00 2001 +From 1e00e3dec282ac00f3eab9d663adce880d519c4b Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 14 Nov 2016 14:44:17 +0200 Subject: [PATCH 22/38] OMS7 compatible 'Ambient notification inversion' @@ -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 4550eb4..7342e2f 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,4 +1,4 @@ -From 415172d6cb86b8608948ebd8d26d5ac8911cb07c Mon Sep 17 00:00:00 2001 +From 4935cc9f77a490d87115c679812d844a44f4c099 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Mon, 5 Dec 2016 19:00:04 +0700 Subject: [PATCH 23/38] SystemUI: Use own drawables for QS expand icon @@ -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 88df6a0..46c73af 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,4 +1,4 @@ -From 429a491bac8c8e3966f9afa5cc80becdb4677f9e Mon Sep 17 00:00:00 2001 +From 91bfe07e4c527b269e263730f650d36f2d699593 Mon Sep 17 00:00:00 2001 From: 0xD34D Date: Mon, 9 Jan 2017 07:19:41 +0530 Subject: [PATCH 24/38] N-Extras: Add dynamic theme BootAnimation support @@ -8,12 +8,12 @@ http://review.cyanogenmod.org/#/c/113273/14 Change-Id: I394897c10f02695f0416e87e9bf960e840bcb3b7 --- - cmds/bootanimation/BootAnimation.cpp | 13 ++++++++++--- + cmds/bootanimation/BootAnimation.cpp | 11 ++++++++--- cmds/bootanimation/BootAnimation.h | 3 ++- - 2 files changed, 12 insertions(+), 4 deletions(-) + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp -index c6b2f63..f374ece 100644 +index d4a9326fc0d..dfa70e3e44c 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -68,6 +68,7 @@ namespace android { @@ -24,7 +24,7 @@ index c6b2f63..f374ece 100644 static const char SYSTEM_DATA_DIR_PATH[] = "/data/system"; static const char SYSTEM_TIME_DIR_NAME[] = "time"; static const char SYSTEM_TIME_DIR_PATH[] = "/data/system/time"; -@@ -317,13 +318,14 @@ status_t BootAnimation::initTexture(SkBitmap *bitmap) +@@ -250,13 +251,14 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame) // Get bootup Animation File @@ -42,7 +42,7 @@ index c6b2f63..f374ece 100644 // Load animations of Carrier through regionalization environment if (Environment::isSupported()) { -@@ -408,6 +410,9 @@ status_t BootAnimation::readyToRun() { +@@ -341,6 +343,9 @@ status_t BootAnimation::readyToRun() { if (encryptedAnimation && (access(getAnimationFileName(IMG_ENC), R_OK) == 0)) { mZipFileName = getAnimationFileName(IMG_ENC); } @@ -52,20 +52,11 @@ index c6b2f63..f374ece 100644 else if (access(getAnimationFileName(IMG_OEM), R_OK) == 0) { mZipFileName = getAnimationFileName(IMG_OEM); } -@@ -421,6 +426,8 @@ status_t BootAnimation::readyToRun() { - FILE* fd; - if (encryptedAnimation && access(getAnimationFileName(IMG_ENC), R_OK) == 0) - fd = fopen(getAnimationFileName(IMG_ENC), "r"); -+ else if (access(getAnimationFileName(IMG_THM), R_OK) == 0) -+ fd = fopen(getAnimationFileName(IMG_THM), "r"); - else if (access(getAnimationFileName(IMG_OEM), R_OK) == 0) - fd = fopen(getAnimationFileName(IMG_OEM), "r"); - else if (access(getAnimationFileName(IMG_SYS), R_OK) == 0) diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h -index b70cc0e..958a022 100644 +index c0ae6b6edb1..e779246da46 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h -@@ -122,8 +122,9 @@ private: +@@ -114,8 +114,9 @@ private: *IMG_OEM: bootanimation file from oem/media *IMG_SYS: bootanimation file from system/media *IMG_ENC: encrypted bootanimation file from system/media @@ -77,5 +68,5 @@ index b70cc0e..958a022 100644 status_t initTexture(Texture* texture, AssetManager& asset, const char* name); status_t initTexture(const Animation::Frame& frame); -- -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 9eb6494..6cc1418 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,4 +1,4 @@ -From fd877629e3a2d8bfdafb1ba1371237396ba176e1 Mon Sep 17 00:00:00 2001 +From f94acee53b3fccbc654e6cf433d54a8372257c6e Mon Sep 17 00:00:00 2001 From: 0xD34D Date: Wed, 22 Jun 2016 23:54:23 +0300 Subject: [PATCH 25/38] N-Extras: Add dynamic theme fonts support @@ -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/38] N-Extras: AudioService: Allow system effect sounds to @@ -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 cd766af..2e3d5a6 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 cd766af..2e3d5a6 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 8e1dad6..6952725 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,4 +1,4 @@ -From 0b5d2c23c6f07c09a0181c76cc83cbb61da4d495 Mon Sep 17 00:00:00 2001 +From 3722812f93a0ba0de99a435bfdc0f121a5f650d7 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 4 Jul 2016 06:25:15 +0300 Subject: [PATCH 27/38] OMS7-N: ApplicationsState: add filter for Substratum @@ -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 8734985..cd37775 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,4 +1,4 @@ -From db55a4020f8942389b3862ddb7442c5f50d62f15 Mon Sep 17 00:00:00 2001 +From 2cffbe56ae7585e6d863b9647e88303e921bc4de Mon Sep 17 00:00:00 2001 From: Kuba Schenk Date: Thu, 1 Dec 2016 21:48:26 +0100 Subject: [PATCH 28/38] OMS7-N: ApplicationsState: add filter for Substratum @@ -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 fe79dc3..27cb85e 100644 --- a/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch +++ b/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch @@ -1,4 +1,4 @@ -From da38273a4dc66c1f259b89430ffcb3c58db0e39c Mon Sep 17 00:00:00 2001 +From 81a4c442d12408b9d19ead73134d12cc777adf4b Mon Sep 17 00:00:00 2001 From: Abdulwahab Isam Date: Fri, 7 Oct 2016 08:30:11 +0300 Subject: [PATCH 29/38] Themes: Expose QS battery @@ -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 6756897..9cc93f7 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,4 +1,4 @@ -From 4045dd2c0cbb895e8d430a9388d33b5596a9fd2b Mon Sep 17 00:00:00 2001 +From 1808dee12401982a7df5f7538a40f78de9c1dfe8 Mon Sep 17 00:00:00 2001 From: bigrushdog Date: Mon, 19 Dec 2016 04:33:31 -0800 Subject: [PATCH 30/38] OMS: Introduce MODIFY_OVERLAYS permission for user apps @@ -16,10 +16,10 @@ Change-Id: Ib6b10b516577f338aee31e759bfd16278f902c20 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 986be28..abed0df 100644 +index 6a5bd3946db..3ceb17ba568 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -3160,6 +3160,12 @@ +@@ -3162,6 +3162,12 @@ @@ -33,7 +33,7 @@ index 986be28..abed0df 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 100644 +index 1823629341c..d0923ccf6dc 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 100644 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 91c2989..816ed3c 100644 --- a/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch +++ b/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch @@ -1,4 +1,4 @@ -From ee6b990018d29a124adc51e273d1fe0cf5fa66bc Mon Sep 17 00:00:00 2001 +From 05d4715f44f7ae4e33517d404c528ac90520cf91 Mon Sep 17 00:00:00 2001 From: daveyannihilation Date: Sun, 1 Jan 2017 01:47:53 -0700 Subject: [PATCH 31/38] SystemUI: Expose switch bar title @@ -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-Themes-Expose-manifest-styles-for-themes.patch b/patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch index a682146..8e06450 100644 --- a/patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch +++ b/patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch @@ -1,4 +1,4 @@ -From b865d57f51ef8545a434dfdfee32055954ce952b Mon Sep 17 00:00:00 2001 +From e1dfd205fa7e1f3c7008e72fb15fe01577ad944c Mon Sep 17 00:00:00 2001 From: Bryan Owens Date: Fri, 6 Jan 2017 21:12:15 +0800 Subject: [PATCH 32/38] Themes: Expose manifest styles for themes @@ -11,10 +11,10 @@ Change-Id: Ie3a4fdead4f4fa1c121018b38de1c86a05bbcff2 create mode 100644 core/res/res/values/projekt_styles.xml diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index abed0df..6ac87ca 100644 +index 3ceb17ba568..36df6eac13e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -3212,7 +3212,7 @@ +@@ -3214,7 +3214,7 @@ android:label="@string/managed_profile_label"> -@@ -3253,14 +3253,14 @@ +@@ -3255,14 +3255,14 @@ -@@ -3268,19 +3268,19 @@ +@@ -3270,19 +3270,19 @@ -@@ -3300,7 +3300,7 @@ +@@ -3302,7 +3302,7 @@ -@@ -3321,7 +3321,7 @@ +@@ -3323,7 +3323,7 @@ -@@ -3329,7 +3329,7 @@ +@@ -3331,7 +3331,7 @@ diff --git a/core/res/res/values/projekt_styles.xml b/core/res/res/values/projekt_styles.xml new file mode 100644 -index 0000000..e5fe635 +index 00000000000..e5fe635818a --- /dev/null +++ b/core/res/res/values/projekt_styles.xml @@ -0,0 +1,41 @@ @@ -147,5 +147,5 @@ index 0000000..e5fe635 + + -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0033-OMS-StrictMode-and-files-under-data-system-theme.patch b/patches/frameworks/base/0033-OMS-StrictMode-and-files-under-data-system-theme.patch index 8be7278..fb4a2d6 100644 --- a/patches/frameworks/base/0033-OMS-StrictMode-and-files-under-data-system-theme.patch +++ b/patches/frameworks/base/0033-OMS-StrictMode-and-files-under-data-system-theme.patch @@ -1,4 +1,4 @@ -From a33286e7a15b13bf4d8ac2aa9a779b8b888c9d2a Mon Sep 17 00:00:00 2001 +From 6f4471f0ce013aa2372be0d1740a18003a348a1e Mon Sep 17 00:00:00 2001 From: mickybart Date: Sat, 19 Nov 2016 19:05:05 -0500 Subject: [PATCH 33/38] OMS: StrictMode and files under /data/system/theme/ @@ -22,7 +22,7 @@ Change-Id: I154dc4280de8eaf891772a9632283e9f547f5718 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java -index 67378bd..4fb189e 100644 +index 67378bd0cd8..4fb189e85c1 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -2342,7 +2342,8 @@ public abstract class Uri implements Parcelable, Comparable { @@ -36,5 +36,5 @@ index 67378bd..4fb189e 100644 } } -- -2.9.3 +2.11.1 diff --git a/patches/frameworks/base/0034-doze-allow-grayscale-even-if-invert-boolean-is-false.patch b/patches/frameworks/base/0034-doze-allow-grayscale-even-if-invert-boolean-is-false.patch index 30f3445..0cc255e 100644 --- a/patches/frameworks/base/0034-doze-allow-grayscale-even-if-invert-boolean-is-false.patch +++ b/patches/frameworks/base/0034-doze-allow-grayscale-even-if-invert-boolean-is-false.patch @@ -1,4 +1,4 @@ -From 82244aeb8e03cec7e5cbbcd89fef918ea3d151d2 Mon Sep 17 00:00:00 2001 +From 6b8eab5e96bf1889d8ffb4f4da9ed6552018d81f Mon Sep 17 00:00:00 2001 From: Daniel Koman Date: Wed, 28 Sep 2016 15:28:26 +0200 Subject: [PATCH 34/38] doze: allow grayscale even if invert boolean is false @@ -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/0035-Expose-external-qs-tile-tint-color.patch b/patches/frameworks/base/0035-Expose-external-qs-tile-tint-color.patch index 7bc7c43..bedb5dd 100644 --- a/patches/frameworks/base/0035-Expose-external-qs-tile-tint-color.patch +++ b/patches/frameworks/base/0035-Expose-external-qs-tile-tint-color.patch @@ -1,4 +1,4 @@ -From a71d0e0ea46b7d910dea2f9c0eafbab2b1e3ef24 Mon Sep 17 00:00:00 2001 +From 3dc4ac418abd5cb3e3fa49377fbc12a6c88fae8c Mon Sep 17 00:00:00 2001 From: Alex Cruz Date: Tue, 24 Jan 2017 11:14:46 +0100 Subject: [PATCH 35/38] Expose external qs tile tint color @@ -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/0036-graphics-ADB-N-icon-compatible-with-OMS7.patch b/patches/frameworks/base/0036-graphics-ADB-N-icon-compatible-with-OMS7.patch index c3b926f..0197473 100644 --- a/patches/frameworks/base/0036-graphics-ADB-N-icon-compatible-with-OMS7.patch +++ b/patches/frameworks/base/0036-graphics-ADB-N-icon-compatible-with-OMS7.patch @@ -1,4 +1,4 @@ -From cd5423a1a675a6ac3986ac9960a6c9db8a386b0b Mon Sep 17 00:00:00 2001 +From eef9bb93ec4e320cda2d3bdcb52838226040626b Mon Sep 17 00:00:00 2001 From: George G Date: Thu, 2 Feb 2017 01:52:27 +0200 Subject: [PATCH 36/38] graphics: ADB "N" icon compatible with OMS7 @@ -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/0037-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch b/patches/frameworks/base/0037-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch index 347da96..b506a2d 100644 --- a/patches/frameworks/base/0037-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch +++ b/patches/frameworks/base/0037-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch @@ -1,4 +1,4 @@ -From 1a4d5be7f78b87480be19243ae88e543a1b9db58 Mon Sep 17 00:00:00 2001 +From 00fbcc2ad550555e8059fac66d621d427851ed81 Mon Sep 17 00:00:00 2001 From: Alex Cruz Date: Sat, 4 Feb 2017 14:13:26 +0100 Subject: [PATCH 37/38] Set external QS tiles tint mode to SRC_ATOP @@ -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/0038-Themes-Expose-Keyguard-affordance-circle-background.patch b/patches/frameworks/base/0038-Themes-Expose-Keyguard-affordance-circle-background.patch index 9abb843..c400219 100644 --- a/patches/frameworks/base/0038-Themes-Expose-Keyguard-affordance-circle-background.patch +++ b/patches/frameworks/base/0038-Themes-Expose-Keyguard-affordance-circle-background.patch @@ -1,4 +1,4 @@ -From c06669d9a78ed88300a59d9cb1e6f9555086e569 Mon Sep 17 00:00:00 2001 +From 727d6a18ff231377156a16bcbd544a71dd0fdf3f Mon Sep 17 00:00:00 2001 From: Branden M Date: Wed, 1 Feb 2017 22:22:45 -0600 Subject: [PATCH 38/38] Themes: Expose Keyguard affordance circle background @@ -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/packages/apps/Settings/0001-Settings-Expose-dashboard-category-and-tile-color.patch b/patches/packages/apps/Settings/0001-Settings-Expose-dashboard-category-and-tile-color.patch index 282a0e7..12e0229 100644 --- a/patches/packages/apps/Settings/0001-Settings-Expose-dashboard-category-and-tile-color.patch +++ b/patches/packages/apps/Settings/0001-Settings-Expose-dashboard-category-and-tile-color.patch @@ -1,4 +1,4 @@ -From 121e37c0c3fe7cc8ac35793777e247ccb812de6b Mon Sep 17 00:00:00 2001 +From fb8b604d7d4d86cf960001f71dc21429915148e4 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Sun, 18 Sep 2016 10:12:05 +0700 Subject: [PATCH 01/15] Settings: Expose dashboard category and tile color @@ -17,7 +17,7 @@ Change-Id: Ia9c83eb9b8360923ed52e03641b4179681a80330 diff --git a/res/drawable/dashboard_category_title_bg.xml b/res/drawable/dashboard_category_title_bg.xml new file mode 100644 -index 0000000..0e9604d +index 0000000000..0e9604d838 --- /dev/null +++ b/res/drawable/dashboard_category_title_bg.xml @@ -0,0 +1,21 @@ @@ -44,7 +44,7 @@ index 0000000..0e9604d + diff --git a/res/drawable/dashboard_tile_bg.xml b/res/drawable/dashboard_tile_bg.xml new file mode 100644 -index 0000000..61d113d +index 0000000000..61d113d645 --- /dev/null +++ b/res/drawable/dashboard_tile_bg.xml @@ -0,0 +1,21 @@ @@ -70,7 +70,7 @@ index 0000000..61d113d + + diff --git a/res/drawable/selectable_card.xml b/res/drawable/selectable_card.xml -index df9ddb1..74018b2 100644 +index df9ddb1367..74018b214b 100644 --- a/res/drawable/selectable_card.xml +++ b/res/drawable/selectable_card.xml @@ -18,5 +18,5 @@ @@ -83,7 +83,7 @@ index df9ddb1..74018b2 100644 + + diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml -index 2e5dd5c..7836644 100644 +index 2e5dd5ce06..7836644806 100644 --- a/res/layout/dashboard_category.xml +++ b/res/layout/dashboard_category.xml @@ -20,7 +20,7 @@ @@ -97,7 +97,7 @@ index 2e5dd5c..7836644 100644 android:layout_width="match_parent" diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml new file mode 100644 -index 0000000..60419bd +index 0000000000..60419bd1f7 --- /dev/null +++ b/res/values/projekt_colors.xml @@ -0,0 +1,21 @@ @@ -123,5 +123,5 @@ index 0000000..60419bd + @color/card_background + -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0002-Settings-Expose-condition-card-colors.patch b/patches/packages/apps/Settings/0002-Settings-Expose-condition-card-colors.patch index 8a0c90c..af80f72 100644 --- a/patches/packages/apps/Settings/0002-Settings-Expose-condition-card-colors.patch +++ b/patches/packages/apps/Settings/0002-Settings-Expose-condition-card-colors.patch @@ -1,4 +1,4 @@ -From fde00a322179ec03d9232001da19a3284e65b807 Mon Sep 17 00:00:00 2001 +From 1b7c96b4230b77062f64f6cf8917ba13beb26006 Mon Sep 17 00:00:00 2001 From: daveyannihilation Date: Tue, 20 Sep 2016 23:35:04 +0800 Subject: [PATCH 02/15] Settings: Expose condition card colors @@ -14,7 +14,7 @@ Change-Id: I8de2e2a4f79a28c0fe1f025b4d23937931fe293a 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml -index 7c9e46d..88277c2 100644 +index 7c9e46da00..88277c2510 100644 --- a/res/layout/condition_card.xml +++ b/res/layout/condition_card.xml @@ -1,6 +1,6 @@ @@ -96,7 +96,7 @@ index 7c9e46d..88277c2 100644 diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml -index 60419bd..9340830 100644 +index 60419bd1f7..9340830703 100644 --- a/res/values/projekt_colors.xml +++ b/res/values/projekt_colors.xml @@ -18,4 +18,13 @@ @@ -114,5 +114,5 @@ index 60419bd..9340830 100644 + @*android:color/primary_text_default_material_dark -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0003-Settings-Expose-storage-summary-text.patch b/patches/packages/apps/Settings/0003-Settings-Expose-storage-summary-text.patch index 52d06de..73d76c8 100644 --- a/patches/packages/apps/Settings/0003-Settings-Expose-storage-summary-text.patch +++ b/patches/packages/apps/Settings/0003-Settings-Expose-storage-summary-text.patch @@ -1,4 +1,4 @@ -From 81f82e54029690d530fc32b31a2a2e77d80bbf18 Mon Sep 17 00:00:00 2001 +From 64be60474bd1d2e0bbf14d91410a411f14261175 Mon Sep 17 00:00:00 2001 From: George G Date: Tue, 3 Nov 2015 23:57:22 +0200 Subject: [PATCH 03/15] Settings: Expose storage summary text @@ -17,7 +17,7 @@ Change-Id: I10c124b6a1516a1be7ac234c1dd7dbe2cbe05bb2 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml -index 7bc51df..c01d2da 100644 +index 7bc51df5e6..c01d2dae5d 100644 --- a/res/layout/storage_summary.xml +++ b/res/layout/storage_summary.xml @@ -33,7 +33,7 @@ @@ -30,7 +30,7 @@ index 7bc51df..c01d2da 100644 android:ellipsize="marquee" android:fadingEdge="horizontal" /> diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml -index 9340830..fb0d99e 100644 +index 9340830703..fb0d99eee3 100644 --- a/res/values/projekt_colors.xml +++ b/res/values/projekt_colors.xml @@ -27,4 +27,6 @@ @@ -41,7 +41,7 @@ index 9340830..fb0d99e 100644 + @*android:color/accent_device_default_light diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java -index e1cf774..2741798 100644 +index e1cf7742ef..274179830c 100644 --- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java +++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java @@ -21,6 +21,7 @@ import android.graphics.Color; @@ -80,7 +80,7 @@ index e1cf774..2741798 100644 super.onBindViewHolder(view); } diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java -index 6389075..9d3c7dc 100644 +index 63890758ba..9d3c7dccf2 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -27,6 +27,7 @@ import android.support.v7.preference.PreferenceViewHolder; @@ -120,5 +120,5 @@ index 6389075..9d3c7dc 100644 } -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0004-Settings-Expose-gesture-settings-switchbar.patch b/patches/packages/apps/Settings/0004-Settings-Expose-gesture-settings-switchbar.patch index c742a8f..bedef01 100644 --- a/patches/packages/apps/Settings/0004-Settings-Expose-gesture-settings-switchbar.patch +++ b/patches/packages/apps/Settings/0004-Settings-Expose-gesture-settings-switchbar.patch @@ -1,4 +1,4 @@ -From f4e4000d09321bf4425201b039d5c2054d2fadad Mon Sep 17 00:00:00 2001 +From 946409ac329ca598e53f2f3811cadd340be32abe Mon Sep 17 00:00:00 2001 From: daveyannihilation Date: Fri, 25 Nov 2016 15:20:04 -0700 Subject: [PATCH 04/15] Settings: Expose gesture settings switchbar @@ -15,7 +15,7 @@ Change-Id: I9857c10ee4e54d27ca1287c80a7d8e420adc9a61 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/res/layout/gesture_preference.xml b/res/layout/gesture_preference.xml -index ccbc42a..9fcd14f 100644 +index ccbc42ad25..9fcd14f3fc 100644 --- a/res/layout/gesture_preference.xml +++ b/res/layout/gesture_preference.xml @@ -31,7 +31,7 @@ @@ -28,7 +28,7 @@ index ccbc42a..9fcd14f 100644 -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0005-Settings-Expose-storage-icon-colors.patch b/patches/packages/apps/Settings/0005-Settings-Expose-storage-icon-colors.patch index 360da46..3f19a59 100644 --- a/patches/packages/apps/Settings/0005-Settings-Expose-storage-icon-colors.patch +++ b/patches/packages/apps/Settings/0005-Settings-Expose-storage-icon-colors.patch @@ -1,4 +1,4 @@ -From d4beb2fe4bbf5105446f23735674a48a0bff5b59 Mon Sep 17 00:00:00 2001 +From 5cb9037f346b3c96ba7e457410d87388499f144c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 8 Dec 2016 20:40:16 +0100 Subject: [PATCH 05/15] Settings: Expose storage icon colors @@ -11,7 +11,7 @@ Change-Id: I97ce427f0683791670f1bbf82eaef66152fe4961 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml -index 00252332..bb6099b 100644 +index 00252332ba..bb6099ba98 100644 --- a/res/values/projekt_colors.xml +++ b/res/values/projekt_colors.xml @@ -31,5 +31,12 @@ @@ -29,7 +29,7 @@ index 00252332..bb6099b 100644 + #ffc0ca33 diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java -index 7757efc..b01013b 100644 +index 533799a1dd..57fd13b734 100755 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -24,6 +24,7 @@ import android.app.Fragment; @@ -88,13 +88,13 @@ index 7757efc..b01013b 100644 @@ -178,7 +186,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index } } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) { - mExternalCategory.addPreference( -- new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0)); -+ new StorageVolumePreference(context, vol, getColorPublic(getResources()), 0)); - } - } + StorageVolumePreference ExStorageVolumePreference = +- new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0); ++ new StorageVolumePreference(context, vol, getColorPublic(getResources()), 0); -@@ -190,7 +198,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index + //Disable preference when in change + ExStorageVolumePreference.setEnabled(vol.getState()!= VolumeInfo.STATE_CHECKING +@@ -195,7 +203,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index // TODO: add actual storage type to record final Drawable icon = context.getDrawable(R.drawable.ic_sim_sd); icon.mutate(); @@ -104,7 +104,7 @@ index 7757efc..b01013b 100644 final Preference pref = new Preference(context); pref.setKey(rec.getFsUuid()); diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java -index 9d3c7dc..8a2780a 100644 +index 9d3c7dccf2..8a2780a90b 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -89,7 +89,7 @@ public class StorageVolumePreference extends Preference { @@ -117,5 +117,5 @@ index 9d3c7dc..8a2780a 100644 } -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0006-Settings-Expose-LinearColorBar-default-colors.patch b/patches/packages/apps/Settings/0006-Settings-Expose-LinearColorBar-default-colors.patch index 93b9c32..072bb8f 100644 --- a/patches/packages/apps/Settings/0006-Settings-Expose-LinearColorBar-default-colors.patch +++ b/patches/packages/apps/Settings/0006-Settings-Expose-LinearColorBar-default-colors.patch @@ -1,4 +1,4 @@ -From c52f89f21eade3f277963374f3c5cf34cad3bdd7 Mon Sep 17 00:00:00 2001 +From 56c08bfddaec67737e1732eb9cd4ffdd52afe236 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 9 Dec 2016 12:47:54 +0100 Subject: [PATCH 06/15] Settings: Expose LinearColorBar default colors @@ -10,7 +10,7 @@ Change-Id: I8e63f10f9e4079d1a03eaece18e8343102f4a755 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml -index bb6099b..e1977f9 100644 +index bb6099ba98..e1977f9fd3 100644 --- a/res/values/projekt_colors.xml +++ b/res/values/projekt_colors.xml @@ -39,4 +39,9 @@ @@ -24,7 +24,7 @@ index bb6099b..e1977f9 100644 + #ffced7db diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java -index b637671..b0b8b82 100644 +index b637671f73..b0b8b82e8c 100644 --- a/src/com/android/settings/applications/LinearColorBar.java +++ b/src/com/android/settings/applications/LinearColorBar.java @@ -15,6 +15,7 @@ import android.util.DisplayMetrics; @@ -64,5 +64,5 @@ index b637671..b0b8b82 100644 \ No newline at end of file +} -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0007-OMS7-N-Apps-show-hide-Substratum-overlays-2-2.patch b/patches/packages/apps/Settings/0007-OMS7-N-Apps-show-hide-Substratum-overlays-2-2.patch index 8a03910..547acf5 100644 --- a/patches/packages/apps/Settings/0007-OMS7-N-Apps-show-hide-Substratum-overlays-2-2.patch +++ b/patches/packages/apps/Settings/0007-OMS7-N-Apps-show-hide-Substratum-overlays-2-2.patch @@ -1,4 +1,4 @@ -From 952537ca209dd20a4bc98ea192aa78032a665b10 Mon Sep 17 00:00:00 2001 +From 457a8da5fd6fa43f790e698b1b0a15f9f0c9acab Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 4 Jul 2016 12:07:11 +0300 Subject: [PATCH 07/15] OMS7-N: Apps: show/hide Substratum overlays [2/2] @@ -18,7 +18,7 @@ Change-Id: I1cd4d4d3acd767a87fe402c325a872a4c04e0438 create mode 100644 res/values/projekt_strings.xml diff --git a/res/menu/manage_apps.xml b/res/menu/manage_apps.xml -index 02ee2bb..67f09e5 100644 +index 02ee2bbefd..67f09e5fc8 100644 --- a/res/menu/manage_apps.xml +++ b/res/menu/manage_apps.xml @@ -30,6 +30,14 @@ @@ -38,7 +38,7 @@ index 02ee2bb..67f09e5 100644 android:showAsAction="never" /> diff --git a/res/values/projekt_strings.xml b/res/values/projekt_strings.xml new file mode 100644 -index 0000000..177e78c +index 0000000000..177e78c49d --- /dev/null +++ b/res/values/projekt_strings.xml @@ -0,0 +1,23 @@ @@ -66,7 +66,7 @@ index 0000000..177e78c + + diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java -index 8b1dd27..070754a 100644 +index 8b1dd27ef1..070754addb 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -107,6 +107,7 @@ public class ManageApplications extends InstrumentedFragment @@ -155,5 +155,5 @@ index 8b1dd27..070754a 100644 switch (mLastSortMode) { case R.id.sort_order_size: -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0008-OMS7-N-Apps-show-hide-Substratum-icon-overlays-2-2.patch b/patches/packages/apps/Settings/0008-OMS7-N-Apps-show-hide-Substratum-icon-overlays-2-2.patch index d6f0870..e574cbe 100644 --- a/patches/packages/apps/Settings/0008-OMS7-N-Apps-show-hide-Substratum-icon-overlays-2-2.patch +++ b/patches/packages/apps/Settings/0008-OMS7-N-Apps-show-hide-Substratum-icon-overlays-2-2.patch @@ -1,4 +1,4 @@ -From 3fcc8bc49ffb6dc7d35e4ba460e932857bff721b Mon Sep 17 00:00:00 2001 +From 45885914daa1443de451af02100299719946ac38 Mon Sep 17 00:00:00 2001 From: Kuba Schenk Date: Thu, 1 Dec 2016 22:00:31 +0100 Subject: [PATCH 08/15] OMS7-N: Apps: show/hide Substratum icon overlays [2/2] @@ -18,7 +18,7 @@ Change-Id: Ib6dd011f821f21bee6da1979615f2eb4658c9f52 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/res/menu/manage_apps.xml b/res/menu/manage_apps.xml -index 67f09e5..267cff8 100644 +index 67f09e5fc8..267cff8b41 100644 --- a/res/menu/manage_apps.xml +++ b/res/menu/manage_apps.xml @@ -38,6 +38,14 @@ @@ -37,7 +37,7 @@ index 67f09e5..267cff8 100644 android:title="@string/sort_order_alpha" android:showAsAction="never" /> diff --git a/res/values/projekt_strings.xml b/res/values/projekt_strings.xml -index 177e78c..4c45544 100644 +index 177e78c49d..4c4554415d 100644 --- a/res/values/projekt_strings.xml +++ b/res/values/projekt_strings.xml @@ -20,4 +20,9 @@ @@ -51,7 +51,7 @@ index 177e78c..4c45544 100644 + diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java -index 070754a..5d3b353 100644 +index 070754addb..5d3b353766 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -108,6 +108,7 @@ public class ManageApplications extends InstrumentedFragment @@ -147,5 +147,5 @@ index 070754a..5d3b353 100644 switch (mLastSortMode) { case R.id.sort_order_size: -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0009-Exclude-overlays-from-the-app-counter.patch b/patches/packages/apps/Settings/0009-Exclude-overlays-from-the-app-counter.patch index f140374..5032e59 100644 --- a/patches/packages/apps/Settings/0009-Exclude-overlays-from-the-app-counter.patch +++ b/patches/packages/apps/Settings/0009-Exclude-overlays-from-the-app-counter.patch @@ -1,4 +1,4 @@ -From 9e3533dad0365c72196f773688d54061572943ca Mon Sep 17 00:00:00 2001 +From 38bcbdd04a15f416a8840e23d3d168684f940607 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Fri, 9 Dec 2016 02:19:20 +0100 Subject: [PATCH 09/15] Exclude overlays from the app counter @@ -16,7 +16,7 @@ Change-Id: I8cd591dc89eb87057e8c2ae3b2cca2c76c34534b 2 files changed, 7 insertions(+) diff --git a/src/com/android/settings/applications/AppCounter.java b/src/com/android/settings/applications/AppCounter.java -index fb8d580..852358d 100644 +index fb8d5809e7..852358dca3 100644 --- a/src/com/android/settings/applications/AppCounter.java +++ b/src/com/android/settings/applications/AppCounter.java @@ -47,6 +47,7 @@ public abstract class AppCounter extends AsyncTask { @@ -28,7 +28,7 @@ index fb8d580..852358d 100644 user.id); for (ApplicationInfo info : list.getList()) { diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java -index 5d3b353..ed61781 100644 +index 5d3b353766..ed617814b3 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -1297,6 +1297,12 @@ public class ManageApplications extends InstrumentedFragment @@ -45,5 +45,5 @@ index 5d3b353..ed61781 100644 } Intent launchIntent = new Intent(Intent.ACTION_MAIN, null) -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0010-Hide-the-show-hide-overlays-when-no-overlay-installe.patch b/patches/packages/apps/Settings/0010-Hide-the-show-hide-overlays-when-no-overlay-installe.patch index 6c5bcb3..eb1888a 100644 --- a/patches/packages/apps/Settings/0010-Hide-the-show-hide-overlays-when-no-overlay-installe.patch +++ b/patches/packages/apps/Settings/0010-Hide-the-show-hide-overlays-when-no-overlay-installe.patch @@ -1,4 +1,4 @@ -From 6e982674f97c80b325d739c417c95734991f1eaa Mon Sep 17 00:00:00 2001 +From 5e86a2b47a16296973b88288668cce923008769f Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Wed, 14 Dec 2016 14:58:54 +0100 Subject: [PATCH 10/15] Hide the "show/hide overlays" when no overlay installed @@ -9,7 +9,7 @@ Change-Id: I54088d27c9492e0992992de59bf340fe2465260a 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java -index ed61781..c3bc4d4 100644 +index ed617814b3..c3bc4d4a94 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -195,6 +195,10 @@ public class ManageApplications extends InstrumentedFragment @@ -82,5 +82,5 @@ index ed61781..c3bc4d4 100644 private final ManageApplications mManageApplications; -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0011-Expose-color-for-external-settings-icons.patch b/patches/packages/apps/Settings/0011-Expose-color-for-external-settings-icons.patch index 67df099..5627cdf 100644 --- a/patches/packages/apps/Settings/0011-Expose-color-for-external-settings-icons.patch +++ b/patches/packages/apps/Settings/0011-Expose-color-for-external-settings-icons.patch @@ -1,4 +1,4 @@ -From f50ef9c89b3cd4ae9d66e885b2d406fdad3931be Mon Sep 17 00:00:00 2001 +From 72e1afef314bb14db0b33f03bc0e346edd640573 Mon Sep 17 00:00:00 2001 From: Clark Scheff Date: Fri, 23 Dec 2016 09:52:57 -0500 Subject: [PATCH 11/15] Expose color for external settings icons @@ -24,7 +24,7 @@ Change-Id: Ifb4a99a315271cdcf978a796e3dea0eaef8d7750 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml -index e1977f9..4ecd1b2 100644 +index e1977f9fd3..4ecd1b293c 100644 --- a/res/values/projekt_colors.xml +++ b/res/values/projekt_colors.xml @@ -39,9 +39,11 @@ @@ -41,7 +41,7 @@ index e1977f9..4ecd1b2 100644 + ?android:attr/colorAccent diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java -index 6b2e145..c29da43 100644 +index 6b2e145dc3..c29da4308e 100755 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -114,10 +114,10 @@ public class DashboardAdapter extends RecyclerView.Adapter Date: Sun, 8 Jan 2017 00:18:47 +0100 Subject: [PATCH 12/15] Expose dashboard category padding bottom @@ -11,7 +11,7 @@ Change-Id: I5a0d3266bbe96dbe6a136f78ed84cb1ee0a6a19b create mode 100644 res/values/projekt_dimens.xml diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml -index 7836644..86dac35 100644 +index 7836644806..86dac35d47 100644 --- a/res/layout/dashboard_category.xml +++ b/res/layout/dashboard_category.xml @@ -19,7 +19,7 @@ @@ -25,7 +25,7 @@ index 7836644..86dac35 100644 8dip + -- -2.9.3 +2.11.1 diff --git a/patches/packages/apps/Settings/0013-Expose-switchbar-background-color.patch b/patches/packages/apps/Settings/0013-Expose-switchbar-background-color.patch index 4609b94..a7f2e97 100644 --- a/patches/packages/apps/Settings/0013-Expose-switchbar-background-color.patch +++ b/patches/packages/apps/Settings/0013-Expose-switchbar-background-color.patch @@ -1,4 +1,4 @@ -From 1fd8e4207626877ebf22d1c6b258fade0790a704 Mon Sep 17 00:00:00 2001 +From c65c1780b0e6df30bfbc56736916178698b85597 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Sun, 8 Jan 2017 01:22:47 +0100 Subject: [PATCH 13/15] Expose switchbar background color @@ -11,7 +11,7 @@ Change-Id: Idc8b09c921bb57c9464d6ea956cfdd9b2b95e6a8 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml -index 4ecd1b2..f37cc54 100644 +index 4ecd1b293c..f37cc54bb2 100644 --- a/res/values/projekt_colors.xml +++ b/res/values/projekt_colors.xml @@ -46,4 +46,6 @@ @@ -22,7 +22,7 @@ index 4ecd1b2..f37cc54 100644 + ?android:attr/colorSecondary diff --git a/res/values/themes.xml b/res/values/themes.xml -index ffe802e..acabe21 100644 +index ffe802e2f2..acabe2195f 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -196,13 +196,13 @@ @@ -42,7 +42,7 @@ index ffe802e..acabe21 100644