-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?= <marten.kongstad@sonymobile.com>
Date: Tue, 15 Dec 2015 16:08:31 +0100
Subject: [PATCH 01/38] OMS7-N: Support tagging resources as OK to overlay
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:
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 {
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
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)
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 {
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,
: 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:
Vector<sp<ConfigList> > mOrderedConfigs;
SortedVector<String16> mCanAddEntries;
--
-2.9.3
+2.11.1
-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?= <marten.kongstad@sonymobile.com>
Date: Tue, 15 Dec 2015 16:40:23 +0100
Subject: [PATCH 02/38] OMS7-N: Introduce the OverlayManagerService [2/11]
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 += \
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 {
* 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 {
* {@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 @@
+}
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 @@
+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 @@
+ }
+}
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 {
+ 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 @@
+ <protected-broadcast android:name="android.intent.action.OVERLAY_REMOVED" />
+ <protected-broadcast android:name="android.intent.action.OVERLAY_PRIORITY_CHANGED" />
+ <protected-broadcast android:name="Auth_password_wrong" />
<protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
- <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGING" />
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 @@
+}
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 @@
+}
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 @@
+}
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 @@
+}
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 @@
+ }
+}
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);
}
}
@Override
--
-2.9.3
+2.11.1
-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?= <marten.kongstad@sonymobile.com>
Date: Thu, 2 Jun 2016 09:35:31 +0200
Subject: [PATCH 03/38] OMS7-N: Integrate OverlayManagerService into framework
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 +++++-----
.../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 @@
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\
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,
#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 @@
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 {
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 @@
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 {
+ 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 {
+ 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;
}
}
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 {
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;
? new ArraySet<String>(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,
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:
static Mutex gLock;
static DefaultKeyedVector<String8, wp<SharedZip> > 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(
sharedRes = const_cast<AssetManager*>(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;
}
- sharedRes->add(oass, oidmap, offset + 1, false);
- const_cast<AssetManager*>(this)->mAssetPaths.add(oap);
- const_cast<AssetManager*>(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<AssetManager*>(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));
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;
}
AssetManager::SharedZip::~SharedZip()
{
if (kIsDebug) {
-@@ -2101,22 +2013,6 @@ bool AssetManager::ZipSet::isUpToDate()
+@@ -2124,22 +2029,6 @@ bool AssetManager::ZipSet::isUpToDate()
return true;
}
* 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 @@
* 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
* 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 {
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;
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<String, Set<String>> mKnownCodebase =
new ArrayMap<String, Set<String>>();
/**
* 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
// 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 <Package>/system/vendor
scanDirLI(new File(RegionalizationSystemDir, "vendor/overlay"),
PackageParser.PARSE_IS_SYSTEM | PackageParser.PARSE_IS_SYSTEM_DIR,
}
}
-@@ -6723,60 +6718,6 @@ public class PackageManagerService extends IPackageManager.Stub {
+@@ -6729,60 +6724,6 @@ public class PackageManagerService extends IPackageManager.Stub {
return finalList;
}
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);
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;
}
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");
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);
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,
}
}
-@@ -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) {
}
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
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 {
} 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;
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();
// service, and permissions service, therefore we start it after them.
startSensorService();
--
-2.9.3
+2.11.1
-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?= <marten.kongstad@sonymobile.com>
Date: Mon, 25 Apr 2016 16:29:22 +0200
Subject: [PATCH 04/38] OMS7-N: Set EXTRA_REPLACING correctly in
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) {
}
sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,
--
-2.9.3
+2.11.1
-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?= <marten.kongstad@sonymobile.com>
Date: Mon, 29 Feb 2016 14:12:35 +0100
Subject: [PATCH 05/38] OMS7-N: idmap: suppress print for padded resources
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 {
}
--
-2.9.3
+2.11.1
-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?= <marten.kongstad@sonymobile.com>
Date: Thu, 2 Jun 2016 09:34:36 +0200
Subject: [PATCH 06/38] OMS7-N: Fix memory leak during idmap creation [6/11]
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
bool AssetManager::addDefaultAssets()
--
-2.9.3
+2.11.1
-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?= <marten.kongstad@sonymobile.com>
Date: Thu, 2 Jun 2016 09:35:09 +0200
Subject: [PATCH 07/38] OMS7-N: installd: add command 'rmidmap' [7/11]
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 {
assertValidInstructionSet(instructionSet);
mInstaller.execute("rmdex", codePath, instructionSet);
--
-2.9.3
+2.11.1
-From 5e8fc3854ee67ed15983c460b390d0cff1dde775 Mon Sep 17 00:00:00 2001
+From 961527ef5940fdf23c7c4311981c835b5fd0f699 Mon Sep 17 00:00:00 2001
From: Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>
Date: Wed, 26 Jan 2011 23:28:43 -0800
Subject: [PATCH 08/38] OMS7-N: Disable Zygote preloaded drawables [8/11]
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 {
mResources.finishPreloading();
} catch (RuntimeException e) {
--
-2.9.3
+2.11.1
-From fc7d694af82449a4d4a3456ffd486a5afa30a2ef Mon Sep 17 00:00:00 2001
+From 881efe212818d0cd62fb90f41f15bd368c7cc58d Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Sun, 19 Jun 2016 10:37:13 -0400
Subject: [PATCH 09/38] OMS7-N: Persistence on boot through
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 {
private void removeIdmapIfPossible(@NonNull final OverlayInfo oi) {
--
-2.9.3
+2.11.1
-From c41b5f7552e5ef1f221d1f755b37501037463c66 Mon Sep 17 00:00:00 2001
+From accdb618c530796534fc4b84e69fc81ea6d98f07 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Thu, 27 Oct 2016 07:08:00 +0200
Subject: [PATCH 10/38] OMS7-N: Do not enforce code policy limiting overlay
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;
}
mCustomResolverComponentName.getPackageName().equals(pkg.packageName)) {
setUpCustomResolverActivity(pkg);
--
-2.9.3
+2.11.1
-From 61a04ac0c542521026b925d35faf4244e6ea2810 Mon Sep 17 00:00:00 2001
+From d3a24aa7becbcc6ce61d0e13a07b87525d0769fd Mon Sep 17 00:00:00 2001
From: Jacob McSwain <jacob.a.mcswain@gmail.com>
Date: Sun, 26 Jun 2016 15:21:52 -0500
Subject: [PATCH 11/38] OMS7-N: Implement multi-target enable/disable and
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 {
+ 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 {
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 {
}
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 {
}
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;
private int runSetPriority() throws RemoteException {
--
-2.9.3
+2.11.1
-From 68105cc059781ce4d0948cfe6d34511da24079d2 Mon Sep 17 00:00:00 2001
+From e1469be527249a4015953afaef58ea65b96ab673 Mon Sep 17 00:00:00 2001
From: Dave Kover <dkover@cyngn.com>
Date: Fri, 9 Dec 2016 10:47:17 -0700
Subject: [PATCH 12/38] Themes: Expose resolver hardcoded colors
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 @@
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 @@
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 @@
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 @@
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 @@
+ <color name="resolver_list_bg">@color/white</color>
+</resources>
--
-2.9.3
+2.11.1
-From 0e81796b338e5009df8049d0ad4c4b2095f4c807 Mon Sep 17 00:00:00 2001
+From 3871ec03b79a47e40ed9405edbdf502500603dff Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Tue, 17 Nov 2015 18:57:11 -0500
Subject: [PATCH 13/38] Themes: Allow Immersive cling colors to be fully themed
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 @@
\ No newline at end of file
+</RelativeLayout>
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 @@
+ <color name="immersive_cling_button_text_color">@android:color/white</color>
</resources>
--
-2.9.3
+2.11.1
-From 16db866f5fdb07a80c87e733af4952ff2484a4f3 Mon Sep 17 00:00:00 2001
+From 2d1f47489f89e1d16ba15f126cabf79b592e64e8 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Mon, 23 Nov 2015 23:49:15 -0500
Subject: [PATCH 14/38] Themes: Allow Permission Icons to be fully themed
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 @@
<ImageView
android:layout_width="wrap_content"
diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml
-index 7408ae9..a7316ab 100644
+index 7408ae99682..a7316ab979c 100644
--- a/core/res/res/values/projekt_colors.xml
+++ b/core/res/res/values/projekt_colors.xml
@@ -20,4 +20,5 @@
+ <color name="app_permission_icon_tint">@android:color/black</color>
</resources>
--
-2.9.3
+2.11.1
-From 91025c7450fc618d35d40d6581172a262d73bd22 Mon Sep 17 00:00:00 2001
+From 877df2f3564c0511e5a8ba7b9b2c91c89d2a6e01 Mon Sep 17 00:00:00 2001
From: Dave Kover <dkover@cyngn.com>
Date: Thu, 14 Apr 2016 10:19:13 +0700
Subject: [PATCH 15/38] Themes: Allow Navbar ripple color to be themed
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 @@
+ <color name="navbutton_ripple_color">#FFFFFFFF</color>
+</resources>
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 {
return mRipplePaint;
}
--
-2.9.3
+2.11.1
-From 2220bc8b7603b3223e73cd4303151d56eda5948b Mon Sep 17 00:00:00 2001
+From aff3bc9220590e6cced7b8cfaefae6bb005843c6 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Sun, 18 Sep 2016 21:33:18 +0700
Subject: [PATCH 16/38] SystemUI: Expose QS edit item decoration background
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 @@
+ <color name="qs_edit_item_decoration_bg">@*android:color/secondary_device_default_settings</color>
</resources>
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<Holder> implements TileSta
mDrawable.setBounds(0, top, width, bottom);
mDrawable.draw(c);
--
-2.9.3
+2.11.1
-From 78783e0ed0a5eb8c3676d152892bf5eebf659317 Mon Sep 17 00:00:00 2001
+From 5772f09122cb0bd56cbd7121a3fd4d2389ef8102 Mon Sep 17 00:00:00 2001
From: Simao Gomes Viana <xdevs23@outlook.com>
Date: Fri, 25 Nov 2016 20:50:29 +0100
Subject: [PATCH 17/38] Allow custom alpha for notification shade bg color
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
invalidate();
}
--
-2.9.3
+2.11.1
-From c6782421d455174ac3b03e994505947471726194 Mon Sep 17 00:00:00 2001
+From 8a1870f105abf0e2236e96fc315e7851c5af0d9b Mon Sep 17 00:00:00 2001
From: "Niklas Schnettler (Sh4dowSoul)" <niklas.schnettler@gmail.com>
Date: Wed, 5 Oct 2016 18:07:43 +0200
Subject: [PATCH 18/38] Themes: Expose various QuickSettings text colors
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 @@
<android.support.v7.widget.RecyclerView
android:id="@android:id/list"
diff --git a/packages/SystemUI/res/layout/status_bar_alarm_group.xml b/packages/SystemUI/res/layout/status_bar_alarm_group.xml
-index 1b47d4b..dca8afb 100644
+index 1b47d4b5a19..dca8afb8cb8 100644
--- a/packages/SystemUI/res/layout/status_bar_alarm_group.xml
+++ b/packages/SystemUI/res/layout/status_bar_alarm_group.xml
@@ -73,7 +73,7 @@
android:gravity="top"
android:background="?android:attr/selectableItemBackgroundBorderless"
diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index 42f4a15..0f89199 100644
+index 42f4a1568df..0f891994c9d 100644
--- a/packages/SystemUI/res/values/projekt_colors.xml
+++ b/packages/SystemUI/res/values/projekt_colors.xml
@@ -20,4 +20,8 @@
+ <color name="qs_edit_toolbar_text_color">#FFFFFF</color>
</resources>
--
-2.9.3
+2.11.1
-From 665ebd4404843764b9a98c3fef7a2e6007695d40 Mon Sep 17 00:00:00 2001
+From 3a0db1599e4075a7e9b08d0926e699da38378f45 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Sat, 27 Aug 2016 10:56:46 -0400
Subject: [PATCH 19/38] Notifications: Expose a bool to disable dynamic colors
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;
}
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 @@
</resources>
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 @@
+</resources>
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 @@
+
+</resources>
--
-2.9.3
+2.11.1
-From 85f0110784ed2b55e062ca3c35d05480dc78ab8a Mon Sep 17 00:00:00 2001
+From e484b9a479870311436fa12bc6df4494a9822525 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 14 Nov 2016 14:49:47 +0200
Subject: [PATCH 20/38] Notification dynamic colors bool compatible with OMS7
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
}
--
-2.9.3
+2.11.1
-From a5c8355f8999d9c4868bb22018ed8d6d9e25ad48 Mon Sep 17 00:00:00 2001
+From acc1fe734b3cf4343191dad13cef6f651f9d044a Mon Sep 17 00:00:00 2001
From: Daniel Koman <dankoman30@gmail.com>
Date: Fri, 17 Apr 2015 11:56:28 -0600
Subject: [PATCH 21/38] Allow prevention of doze notification color inversion
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 @@
+
</resources>
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 @@
+
</resources>
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;
for (int i = 0; i < mTargets.size(); i++) {
mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
--
-2.9.3
+2.11.1
-From 367e7476f68b80c265bedb92a019cb5fd7c8dfc7 Mon Sep 17 00:00:00 2001
+From 1e00e3dec282ac00f3eab9d663adce880d519c4b Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 14 Nov 2016 14:44:17 +0200
Subject: [PATCH 22/38] OMS7 compatible 'Ambient notification inversion'
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;
for (int i = 0; i < mTargets.size(); i++) {
mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
--
-2.9.3
+2.11.1
-From 415172d6cb86b8608948ebd8d26d5ac8911cb07c Mon Sep 17 00:00:00 2001
+From 4935cc9f77a490d87115c679812d844a44f4c099 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Mon, 5 Dec 2016 19:00:04 +0700
Subject: [PATCH 23/38] SystemUI: Use own drawables for QS expand icon
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 @@
\ 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 @@
+</set>
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 @@
+</set>
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 @@
\ 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 @@
+</set>
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 @@
+</set>
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 @@
+</vector>
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 @@
+</animated-vector>
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 @@
+</vector>
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 @@
+</animated-vector>
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 @@
+ 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 @@
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+ 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/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 {
}
--
-2.9.3
+2.11.1
-From 429a491bac8c8e3966f9afa5cc80becdb4677f9e Mon Sep 17 00:00:00 2001
+From 91bfe07e4c527b269e263730f650d36f2d699593 Mon Sep 17 00:00:00 2001
From: 0xD34D <clark@scheffsblend.com>
Date: Mon, 9 Jan 2017 07:19:41 +0530
Subject: [PATCH 24/38] N-Extras: Add dynamic theme BootAnimation support
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 {
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
// 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);
}
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
status_t initTexture(Texture* texture, AssetManager& asset, const char* name);
status_t initTexture(const Animation::Frame& frame);
--
-2.9.3
+2.11.1
-From fd877629e3a2d8bfdafb1ba1371237396ba176e1 Mon Sep 17 00:00:00 2001
+From f94acee53b3fccbc654e6cf433d54a8372257c6e Mon Sep 17 00:00:00 2001
From: 0xD34D <clark@scheffsblend.com>
Date: Wed, 22 Jun 2016 23:54:23 +0300
Subject: [PATCH 25/38] N-Extras: Add dynamic theme fonts support
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;
}
}
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
* 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<Configuration
/**
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
-index e1b7fda..6dcd045 100644
+index e1b7fdad25e..6dcd045b07f 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -516,11 +516,12 @@ public class Process {
//TODO optionally enable debuger
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
-index 85d84bb..81257f0 100644
+index 85d84bb3f98..81257f0d341 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -22,6 +22,7 @@ import static android.system.OsConstants.STDERR_FILENO;
break;
}
diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java
-index 7871aa8..f4590c9 100644
+index 7871aa81dde..f4590c94647 100644
--- a/graphics/java/android/graphics/FontListParser.java
+++ b/graphics/java/android/graphics/FontListParser.java
@@ -21,6 +21,9 @@ import android.util.Xml;
return new Font(fullFilename, index, axes, weight, isItalic);
}
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
-index 2886f0d..990c9bd 100644
+index 2886f0dd4a2..990c9bd1fbf 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -17,6 +17,7 @@
protected void finalize() throws Throwable {
try {
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index 2822dc9..ab010d4 100644
+index 2822dc93d2b..ab010d4cb07 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -512,6 +512,8 @@ public final class ActivityManagerService extends ActivityManagerNative
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
--
-2.9.3
+2.11.1
-From f3f83a64481e2abdf561f7c42d7f2e7d5f32012b Mon Sep 17 00:00:00 2001
+From 2ae9c134e5eefee70bb1abce584b0db310baa8f5 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Sun, 17 Jul 2016 17:56:40 -0400
Subject: [PATCH 26/38] N-Extras: AudioService: Allow system effect sounds to
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;
mediaPlayer.setAudioStreamType(AudioSystem.STREAM_SYSTEM);
mediaPlayer.prepare();
--
-2.9.3
+2.11.1
-From 0b5d2c23c6f07c09a0181c76cc83cbb61da4d495 Mon Sep 17 00:00:00 2001
+From 3722812f93a0ba0de99a435bfdc0f121a5f650d7 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 4 Jul 2016 06:25:15 +0300
Subject: [PATCH 27/38] OMS7-N: ApplicationsState: add filter for Substratum
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 {
private int mCurrentUser;
--
-2.9.3
+2.11.1
-From db55a4020f8942389b3862ddb7442c5f50d62f15 Mon Sep 17 00:00:00 2001
+From 2cffbe56ae7585e6d863b9647e88303e921bc4de Mon Sep 17 00:00:00 2001
From: Kuba Schenk <abukcz@gmail.com>
Date: Thu, 1 Dec 2016 21:48:26 +0100
Subject: [PATCH 28/38] OMS7-N: ApplicationsState: add filter for Substratum
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 {
private int mCurrentUser;
--
-2.9.3
+2.11.1
-From da38273a4dc66c1f259b89430ffcb3c58db0e39c Mon Sep 17 00:00:00 2001
+From 81a4c442d12408b9d19ead73134d12cc777adf4b Mon Sep 17 00:00:00 2001
From: Abdulwahab Isam <abdoi94.iq@gmail.com>
Date: Fri, 7 Oct 2016 08:30:11 +0300
Subject: [PATCH 29/38] Themes: Expose QS battery
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 @@
<com.android.systemui.ResizingSpace
android:layout_width="match_parent"
diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index 0f89199..83b8524 100644
+index 0f891994c9d..83b852416e1 100644
--- a/packages/SystemUI/res/values/projekt_colors.xml
+++ b/packages/SystemUI/res/values/projekt_colors.xml
@@ -24,4 +24,10 @@
+ <color name="qs_battery_accent">@*android:color/accent_device_default_light</color>
</resources>
--
-2.9.3
+2.11.1
-From 4045dd2c0cbb895e8d430a9388d33b5596a9fd2b Mon Sep 17 00:00:00 2001
+From 1808dee12401982a7df5f7538a40f78de9c1dfe8 Mon Sep 17 00:00:00 2001
From: bigrushdog <randall.rushing@gmail.com>
Date: Mon, 19 Dec 2016 04:33:31 -0800
Subject: [PATCH 30/38] OMS: Introduce MODIFY_OVERLAYS permission for user apps
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 @@
<permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"
android:protectionLevel="signature|privileged" />
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 @@
<!-- Title of policy access to limiting the user's password choices -->
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;
}
--
-2.9.3
+2.11.1
-From ee6b990018d29a124adc51e273d1fe0cf5fa66bc Mon Sep 17 00:00:00 2001
+From 05d4715f44f7ae4e33517d404c528ac90520cf91 Mon Sep 17 00:00:00 2001
From: daveyannihilation <daveyannihilation@hotmail.com>
Date: Sun, 1 Jan 2017 01:47:53 -0700
Subject: [PATCH 31/38] SystemUI: Expose switch bar title
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 @@
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 @@
+</resources>
+
--
-2.9.3
+2.11.1
-From b865d57f51ef8545a434dfdfee32055954ce952b Mon Sep 17 00:00:00 2001
+From e1dfd205fa7e1f3c7008e72fb15fe01577ad944c Mon Sep 17 00:00:00 2001
From: Bryan Owens <djbryan3540@gmail.com>
Date: Fri, 6 Jan 2017 21:12:15 +0800
Subject: [PATCH 32/38] Themes: Expose manifest styles for themes
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">
</activity-alias>
<activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"
android:label="@string/heavy_weight_switcher_title"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"
-@@ -3245,7 +3245,7 @@
+@@ -3247,7 +3247,7 @@
<activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
-@@ -3253,14 +3253,14 @@
+@@ -3255,14 +3255,14 @@
<activity android:name="android.accounts.ChooseTypeAndAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:label="@string/choose_account_label"
android:process=":ui">
</activity>
-@@ -3268,19 +3268,19 @@
+@@ -3270,19 +3270,19 @@
<activity android:name="android.accounts.CantAddAccountActivity"
android:excludeFromRecents="true"
android:exported="true"
android:label="@string/sync_too_many_deletes"
android:process=":ui">
</activity>
-@@ -3300,7 +3300,7 @@
+@@ -3302,7 +3302,7 @@
</activity>
<activity android:name="com.android.internal.app.NetInitiatedActivity"
android:excludeFromRecents="true"
android:process=":ui">
</activity>
-@@ -3321,7 +3321,7 @@
+@@ -3323,7 +3323,7 @@
<activity android:name="com.android.internal.app.ConfirmUserCreationActivity"
android:excludeFromRecents="true"
android:process=":ui"
<intent-filter android:priority="1000">
<action android:name="android.os.action.CREATE_USER" />
<category android:name="android.intent.category.DEFAULT" />
-@@ -3329,7 +3329,7 @@
+@@ -3331,7 +3331,7 @@
</activity>
<activity android:name="com.android.internal.app.UnlaunchableAppActivity"
</activity>
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 @@
+
+</resources>
--
-2.9.3
+2.11.1
-From a33286e7a15b13bf4d8ac2aa9a779b8b888c9d2a Mon Sep 17 00:00:00 2001
+From 6f4471f0ce013aa2372be0d1740a18003a348a1e Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sat, 19 Nov 2016 19:05:05 -0500
Subject: [PATCH 33/38] OMS: StrictMode and files under /data/system/theme/
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<Uri> {
}
}
--
-2.9.3
+2.11.1
-From 82244aeb8e03cec7e5cbbcd89fef918ea3d151d2 Mon Sep 17 00:00:00 2001
+From 6b8eab5e96bf1889d8ffb4f4da9ed6552018d81f Mon Sep 17 00:00:00 2001
From: Daniel Koman <dankoman30@gmail.com>
Date: Wed, 28 Sep 2016 15:28:26 +0200
Subject: [PATCH 34/38] doze: allow grayscale even if invert boolean is false
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 {
public void setInverted(boolean invert, boolean fade, long delay) {
--
-2.9.3
+2.11.1
-From a71d0e0ea46b7d910dea2f9c0eafbab2b1e3ef24 Mon Sep 17 00:00:00 2001
+From 3dc4ac418abd5cb3e3fa49377fbc12a6c88fae8c Mon Sep 17 00:00:00 2001
From: Alex Cruz <mazdarider23@gmail.com>
Date: Tue, 24 Jan 2017 11:14:46 +0100
Subject: [PATCH 35/38] Expose external qs tile tint color
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 @@
+ <color name="external_qs_tile_tint_color">@android:color/white</color>
</resources>
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 {
addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext);
}
--
-2.9.3
+2.11.1
-From cd5423a1a675a6ac3986ac9960a6c9db8a386b0b Mon Sep 17 00:00:00 2001
+From eef9bb93ec4e320cda2d3bdcb52838226040626b Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Thu, 2 Feb 2017 01:52:27 +0200
Subject: [PATCH 36/38] graphics: ADB "N" icon compatible with OMS7
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 {
final PackageManager pm = context.getPackageManager();
try {
--
-2.9.3
+2.11.1
-From 1a4d5be7f78b87480be19243ae88e543a1b9db58 Mon Sep 17 00:00:00 2001
+From 00fbcc2ad550555e8059fac66d621d427851ed81 Mon Sep 17 00:00:00 2001
From: Alex Cruz <mazdarider23@gmail.com>
Date: Sat, 4 Feb 2017 14:13:26 +0100
Subject: [PATCH 37/38] Set external QS tiles tint mode to SRC_ATOP
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;
addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext);
}
--
-2.9.3
+2.11.1
-From c06669d9a78ed88300a59d9cb1e6f9555086e569 Mon Sep 17 00:00:00 2001
+From 727d6a18ff231377156a16bcbd544a71dd0fdf3f Mon Sep 17 00:00:00 2001
From: Branden M <wasabi.dev@gmail.com>
Date: Wed, 1 Feb 2017 22:22:45 -0600
Subject: [PATCH 38/38] Themes: Expose Keyguard affordance circle background
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 @@
+ <color name="keyguard_affordance_circle_background">@android:color/white</color>
</resources>
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
mNormalColor = 0xffffffff;
--
-2.9.3
+2.11.1
-From 121e37c0c3fe7cc8ac35793777e247ccb812de6b Mon Sep 17 00:00:00 2001
+From fb8b604d7d4d86cf960001f71dc21429915148e4 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Sun, 18 Sep 2016 10:12:05 +0700
Subject: [PATCH 01/15] Settings: Expose dashboard category and tile color
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 @@
+</shape>
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 @@
+ <solid android:color="@color/selectable_card_background" />
+</shape>
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 @@
+ <item android:drawable="@drawable/dashboard_tile_bg"/>
+</ripple>
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 @@
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 @@
+ <color name="selectable_card_background">@color/card_background</color>
+</resources>
--
-2.9.3
+2.11.1
-From fde00a322179ec03d9232001da19a3284e65b807 Mon Sep 17 00:00:00 2001
+From 1b7c96b4230b77062f64f6cf8917ba13beb26006 Mon Sep 17 00:00:00 2001
From: daveyannihilation <daveyannihilation@hotmail.com>
Date: Tue, 20 Sep 2016 23:35:04 +0800
Subject: [PATCH 02/15] Settings: Expose condition card colors
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 @@
</com.android.internal.widget.ButtonBarLayout>
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 @@
+ <color name="condition_card_second_button_text_color">@*android:color/primary_text_default_material_dark</color>
</resources>
--
-2.9.3
+2.11.1
-From 81f82e54029690d530fc32b31a2a2e77d80bbf18 Mon Sep 17 00:00:00 2001
+From 64be60474bd1d2e0bbf14d91410a411f14261175 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Tue, 3 Nov 2015 23:57:22 +0200
Subject: [PATCH 03/15] Settings: Expose storage summary text
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 @@
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 @@
+ <color name="storage_summary_title_color">@*android:color/accent_device_default_light</color>
</resources>
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;
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;
}
--
-2.9.3
+2.11.1
-From f4e4000d09321bf4425201b039d5c2054d2fadad Mon Sep 17 00:00:00 2001
+From 946409ac329ca598e53f2f3811cadd340be32abe Mon Sep 17 00:00:00 2001
From: daveyannihilation <daveyannihilation@hotmail.com>
Date: Fri, 25 Nov 2016 15:20:04 -0700
Subject: [PATCH 04/15] Settings: Expose gesture settings switchbar
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 @@
<TextView
android:id="@android:id/title"
diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml
-index fb0d99e..00252332 100644
+index fb0d99eee3..00252332ba 100644
--- a/res/values/projekt_colors.xml
+++ b/res/values/projekt_colors.xml
@@ -29,4 +29,7 @@
+
</resources>
--
-2.9.3
+2.11.1
-From d4beb2fe4bbf5105446f23735674a48a0bff5b59 Mon Sep 17 00:00:00 2001
+From 5cb9037f346b3c96ba7e457410d87388499f144c Mon Sep 17 00:00:00 2001
From: SpiritCroc <spiritcroc@gmail.com>
Date: Thu, 8 Dec 2016 20:40:16 +0100
Subject: [PATCH 05/15] Settings: Expose storage icon colors
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 @@
+ <color name="storage_private_5">#ffc0ca33</color>
</resources>
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;
@@ -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();
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 {
}
--
-2.9.3
+2.11.1
-From c52f89f21eade3f277963374f3c5cf34cad3bdd7 Mon Sep 17 00:00:00 2001
+From 56c08bfddaec67737e1732eb9cd4ffdd52afe236 Mon Sep 17 00:00:00 2001
From: SpiritCroc <spiritcroc@gmail.com>
Date: Fri, 9 Dec 2016 12:47:54 +0100
Subject: [PATCH 06/15] Settings: Expose LinearColorBar default colors
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 @@
+ <color name="linear_color_bar_right">#ffced7db</color>
</resources>
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;
\ No newline at end of file
+}
--
-2.9.3
+2.11.1
-From 952537ca209dd20a4bc98ea192aa78032a665b10 Mon Sep 17 00:00:00 2001
+From 457a8da5fd6fa43f790e698b1b0a15f9f0c9acab Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 4 Jul 2016 12:07:11 +0300
Subject: [PATCH 07/15] OMS7-N: Apps: show/hide Substratum overlays [2/2]
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 @@
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 @@
+
+</resources>
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
switch (mLastSortMode) {
case R.id.sort_order_size:
--
-2.9.3
+2.11.1
-From 3fcc8bc49ffb6dc7d35e4ba460e932857bff721b Mon Sep 17 00:00:00 2001
+From 45885914daa1443de451af02100299719946ac38 Mon Sep 17 00:00:00 2001
From: Kuba Schenk <abukcz@gmail.com>
Date: Thu, 1 Dec 2016 22:00:31 +0100
Subject: [PATCH 08/15] OMS7-N: Apps: show/hide Substratum icon overlays [2/2]
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 @@
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 @@
+
</resources>
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
switch (mLastSortMode) {
case R.id.sort_order_size:
--
-2.9.3
+2.11.1
-From 9e3533dad0365c72196f773688d54061572943ca Mon Sep 17 00:00:00 2001
+From 38bcbdd04a15f416a8840e23d3d168684f940607 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Fri, 9 Dec 2016 02:19:20 +0100
Subject: [PATCH 09/15] Exclude overlays from the app counter
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<Void, Void, Integer> {
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
}
Intent launchIntent = new Intent(Intent.ACTION_MAIN, null)
--
-2.9.3
+2.11.1
-From 6e982674f97c80b325d739c417c95734991f1eaa Mon Sep 17 00:00:00 2001
+From 5e86a2b47a16296973b88288668cce923008769f Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Wed, 14 Dec 2016 14:58:54 +0100
Subject: [PATCH 10/15] Hide the "show/hide overlays" when no overlay installed
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
private final ManageApplications mManageApplications;
--
-2.9.3
+2.11.1
-From f50ef9c89b3cd4ae9d66e885b2d406fdad3931be Mon Sep 17 00:00:00 2001
+From 72e1afef314bb14db0b33f03bc0e346edd640573 Mon Sep 17 00:00:00 2001
From: Clark Scheff <clark@scheffsblend.com>
Date: Fri, 23 Dec 2016 09:52:57 -0500
Subject: [PATCH 11/15] Expose color for external settings icons
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 @@
+ <color name="external_tile_icon_tint_color">?android:attr/colorAccent</color>
</resources>
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<DashboardAdapter.Dash
}
}
--
-2.9.3
+2.11.1
-From 0d488d0698cb80ee8236743a8be9300c7c807917 Mon Sep 17 00:00:00 2001
+From 8d4db41ae5b12205de0b8a29a324e261f2f54e68 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Sun, 8 Jan 2017 00:18:47 +0100
Subject: [PATCH 12/15] Expose dashboard category padding bottom
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 @@
<TextView android:id="@android:id/title"
diff --git a/res/values/projekt_dimens.xml b/res/values/projekt_dimens.xml
new file mode 100644
-index 0000000..a5aae4e
+index 0000000000..a5aae4e99d
--- /dev/null
+++ b/res/values/projekt_dimens.xml
@@ -0,0 +1,16 @@
+ <dimen name="dashboard_category_padding_bottom">8dip</dimen>
+</resources>
--
-2.9.3
+2.11.1
-From 1fd8e4207626877ebf22d1c6b258fade0790a704 Mon Sep 17 00:00:00 2001
+From c65c1780b0e6df30bfbc56736916178698b85597 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Sun, 8 Jan 2017 01:22:47 +0100
Subject: [PATCH 13/15] Expose switchbar background color
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 @@
+ <color name="switchbar_background_color">?android:attr/colorSecondary</color>
</resources>
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 @@
<style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
-index 240c062..ce73a39 100644
+index 240c06296b..ce73a397f0 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -24,6 +24,7 @@ import android.text.SpannableStringBuilder;
mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
mLabel = getResources().getString(R.string.switch_off_text);
--
-2.9.3
+2.11.1
-From 1edcfb911d77e894086bf88ac47f966a8b88fb22 Mon Sep 17 00:00:00 2001
+From 17f5c8bc2386fbf9f3516a30fae7506789cea81d Mon Sep 17 00:00:00 2001
From: SpiritCroc <spiritcroc@gmail.com>
Date: Sun, 22 Jan 2017 20:51:47 +0100
Subject: [PATCH 14/15] Settings: Expose bluetooth pin confirm dialog text
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
-index ebdf65d..6609a1b 100644
+index ebdf65de78..6609a1b70f 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -40,7 +40,7 @@
</LinearLayout>
diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml
-index f37cc54..e0d3ab1 100644
+index f37cc54bb2..e0d3ab1ea3 100644
--- a/res/values/projekt_colors.xml
+++ b/res/values/projekt_colors.xml
@@ -48,4 +48,9 @@
+ <color name="bluetooth_phonebook_sharing_message_confirm_pin">@*android:color/secondary_text_material_light</color>
</resources>
--
-2.9.3
+2.11.1
-From 9bb5dca50887734bbc12e46254464f1d0734ac6f Mon Sep 17 00:00:00 2001
+From d97a240864c1da2c5f705f54fbc308a87a3fbbcc Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Sat, 28 Jan 2017 13:40:55 +0100
Subject: [PATCH 15/15] Set external settings icon tint mode to SRC_ATOP
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
-index c29da43..8259d39 100644
+index c29da4308e..8259d39ee6 100755
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -19,6 +19,7 @@ import android.content.Context;
}
}
--
-2.9.3
+2.11.1
projects / GitHub / Stricted / android_vendor_extra.git / commitdiff