Update OMS patches
authorLuK1337 <priv.luk@gmail.com>
Mon, 13 Mar 2017 15:45:45 +0000 (16:45 +0100)
committerLuK1337 <priv.luk@gmail.com>
Mon, 13 Mar 2017 15:45:45 +0000 (16:45 +0100)
45 files changed:
patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch
patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch
patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch
patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch
patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch
patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch
patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch
patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch
patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch
patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch
patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch
patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch
patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch
patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch
patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch
patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch
patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch
patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch
patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch
patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch
patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch
patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch
patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch
patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch
patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch
patches/frameworks/base/0026-N-Extras-AudioService-Allow-system-effect-sounds-to-.patch
patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch
patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch
patches/frameworks/base/0029-Themes-Expose-QS-battery.patch
patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch
patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch
patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch
patches/frameworks/base/0033-OMS-StrictMode-and-files-under-data-system-theme.patch
patches/frameworks/base/0034-doze-allow-grayscale-even-if-invert-boolean-is-false.patch
patches/frameworks/base/0035-Expose-external-qs-tile-tint-color.patch
patches/frameworks/base/0036-graphics-ADB-N-icon-compatible-with-OMS7.patch
patches/frameworks/base/0037-Set-external-QS-tiles-tint-mode-to-SRC_ATOP.patch
patches/frameworks/base/0038-Themes-Expose-Keyguard-affordance-circle-background.patch
patches/frameworks/base/0039-Notification-tint-add-optional-findContrastColor-alg.patch
patches/frameworks/base/0040-Add-a-protected-broadcast-for-Masquerade-events.patch
patches/frameworks/base/0041-OMS-Add-hide-annotation-to-MODIFY_OVERLAYS-permissio.patch
patches/frameworks/base/0042-FWB-Give-power-dialogs-own-set-of-volume-icons-for-t.patch
patches/frameworks/base/0043-base-Force-authorize-all-calling-packages-by-Masquer.patch
patches/frameworks/base/0044-Revert-Add-a-protected-broadcast-for-Masquerade-even.patch
patches/frameworks/base/0045-ThemeSafety-Introduce-App-Crash-Intent.patch [new file with mode: 0644]

index 34ca0769a1cb1eb9b70594c0ea7a2ad8c7bdb9de..962c8f49e000aa50c18b100351a9aea4fadd8376 100644 (file)
@@ -1,7 +1,7 @@
-From 3dcf1c44b81a2fb51a3da26470cd946303d27261 Mon Sep 17 00:00:00 2001
+From 45cf60053ab74bf9d59c7a0c2d62696dd0478ef0 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/44] OMS7-N: Support tagging resources as OK to overlay
+Subject: [PATCH 01/45] OMS7-N: Support tagging resources as OK to overlay
  [1/11]
 
 This will allow applications to have a resource xml defining what
@@ -33,7 +33,7 @@ Change-Id: I08d11de845c1679017798ea1636ef4c36f820d8e
  7 files changed, 164 insertions(+), 15 deletions(-)
 
 diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp
-index c13d318..8656b0e 100644
+index c13d318f744..8656b0e0e5f 100644
 --- a/cmds/idmap/create.cpp
 +++ b/cmds/idmap/create.cpp
 @@ -106,7 +106,7 @@ fail:
@@ -46,7 +46,7 @@ index c13d318..8656b0e 100644
              return true;
          }
 diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp
-index f6afc85..924090f 100644
+index f6afc859430..924090fbb9d 100644
 --- a/cmds/idmap/inspect.cpp
 +++ b/cmds/idmap/inspect.cpp
 @@ -192,6 +192,12 @@ namespace {
@@ -63,7 +63,7 @@ index f6afc85..924090f 100644
  
          err = buf.nextUint32(&i);
 diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
-index 12a6b0f..6094a57 100644
+index 12a6b0f9a4e..6094a576d75 100644
 --- a/include/androidfw/ResourceTypes.h
 +++ b/include/androidfw/ResourceTypes.h
 @@ -1382,7 +1382,11 @@ struct ResTable_entry
@@ -97,7 +97,7 @@ index 12a6b0f..6094a57 100644
              String8* pTargetPath, String8* pOverlayPath);
  
 diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
-index 5b36a43..c0e8a98 100644
+index 5b36a43abdc..c0e8a980c2d 100644
 --- a/libs/androidfw/AssetManager.cpp
 +++ b/libs/androidfw/AssetManager.cpp
 @@ -252,7 +252,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie)
@@ -110,7 +110,7 @@ index 5b36a43..c0e8a98 100644
          delete idmap;
          return false;
 diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
-index e8c6fcf..022f19e 100644
+index e8c6fcf03a5..022f19efe86 100644
 --- a/libs/androidfw/ResourceTypes.cpp
 +++ b/libs/androidfw/ResourceTypes.cpp
 @@ -59,7 +59,7 @@ namespace android {
@@ -197,7 +197,7 @@ index e8c6fcf..022f19e 100644
  
                      if (inclValues) {
 diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
-index a1b1879..b2d0480 100644
+index a1b1879e745..b2d04802bf1 100644
 --- a/tools/aapt/ResourceTable.cpp
 +++ b/tools/aapt/ResourceTable.cpp
 @@ -800,6 +800,7 @@ status_t compileResourceFile(Bundle* bundle,
@@ -367,7 +367,7 @@ index a1b1879..b2d0480 100644
      : mName(name), mPackageId(packageId),
        mTypeStringsMapping(0xffffffff),
 diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h
-index 54d56cf..7e9b044 100644
+index 54d56cfc26f..7e9b04429cc 100644
 --- a/tools/aapt/ResourceTable.h
 +++ b/tools/aapt/ResourceTable.h
 @@ -139,6 +139,11 @@ public:
@@ -470,5 +470,5 @@ index 54d56cf..7e9b044 100644
          Vector<sp<ConfigList> > mOrderedConfigs;
          SortedVector<String16> mCanAddEntries;
 -- 
-2.9.3
+2.11.1
 
index accacd3d54fcd896a6de79d5bd4c4c848fef3a70..3b8e9586894465d0eece5dd859b1c88589fe13f0 100644 (file)
@@ -1,7 +1,7 @@
-From 9f51624bfb2dbc78f791ef9ea1a9d81c6c4b68f3 Mon Sep 17 00:00:00 2001
+From 32041002c96bbeb5dcffa3beef7114c597abffae 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/44] OMS7-N: Introduce the OverlayManagerService [2/11]
+Subject: [PATCH 02/45] OMS7-N: Introduce the OverlayManagerService [2/11]
 
 Add a new system service to manage Runtime Resource Overlays. This will
 offload the PackageManagerService and allow administration of overlay
@@ -84,7 +84,7 @@ Change-Id: Icc3c7daa25345d20bc5014b865024422eab72f5b
  create mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java
 
 diff --git a/Android.mk b/Android.mk
-index bdb4555..df42780 100644
+index bdb45550fa1..df427801fa7 100644
 --- a/Android.mk
 +++ b/Android.mk
 @@ -137,6 +137,7 @@ LOCAL_SRC_FILES += \
@@ -96,7 +96,7 @@ index bdb4555..df42780 100644
        core/java/android/content/pm/IOnAppsChangedListener.aidl \
        core/java/android/content/pm/IOtaDexopt.aidl \
 diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
-index 3a2f471..1ca44e0 100644
+index 3a2f471e96e..1ca44e0f633 100644
 --- a/core/java/android/content/Context.java
 +++ b/core/java/android/content/Context.java
 @@ -3656,6 +3656,16 @@ public abstract class Context {
@@ -117,7 +117,7 @@ index 3a2f471..1ca44e0 100644
       * process and user ID running in the system.
       *
 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
-index 861aae5..1afae79 100644
+index 861aae5a879..1afae798bcf 100644
 --- a/core/java/android/content/Intent.java
 +++ b/core/java/android/content/Intent.java
 @@ -3092,6 +3092,40 @@ public class Intent implements Parcelable, Cloneable {
@@ -163,7 +163,7 @@ index 861aae5..1afae79 100644
       * {@link DocumentsProvider} instances installed on the device, letting the
 diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl
 new file mode 100644
-index 0000000..4f5d960
+index 00000000000..4f5d96038d1
 --- /dev/null
 +++ b/core/java/android/content/om/IOverlayManager.aidl
 @@ -0,0 +1,129 @@
@@ -298,7 +298,7 @@ index 0000000..4f5d960
 +}
 diff --git a/core/java/android/content/om/OverlayInfo.aidl b/core/java/android/content/om/OverlayInfo.aidl
 new file mode 100644
-index 0000000..e7d413d
+index 00000000000..e7d413d0775
 --- /dev/null
 +++ b/core/java/android/content/om/OverlayInfo.aidl
 @@ -0,0 +1,19 @@
@@ -323,7 +323,7 @@ index 0000000..e7d413d
 +parcelable OverlayInfo;
 diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java
 new file mode 100644
-index 0000000..a25cf0c
+index 00000000000..a25cf0c008c
 --- /dev/null
 +++ b/core/java/android/content/om/OverlayInfo.java
 @@ -0,0 +1,290 @@
@@ -618,7 +618,7 @@ index 0000000..a25cf0c
 +    }
 +}
 diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java
-index f5bcf64..bdbdd1e 100644
+index f5bcf64417a..bdbdd1ebcf9 100644
 --- a/core/java/android/content/pm/PackageManagerInternal.java
 +++ b/core/java/android/content/pm/PackageManagerInternal.java
 @@ -168,4 +168,28 @@ public abstract class PackageManagerInternal {
@@ -651,7 +651,7 @@ index f5bcf64..bdbdd1e 100644
 +    public abstract void setResourceDirs(int userId, String packageName, String[] resourceDirs);
  }
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 2c76dee..6a5bd39 100644
+index 2c76dee9754..6a5bd3946db 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -84,6 +84,10 @@
@@ -667,7 +667,7 @@ index 2c76dee..6a5bd39 100644
      <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
 diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java
 new file mode 100644
-index 0000000..e2a3775
+index 00000000000..e2a37750ef3
 --- /dev/null
 +++ b/services/core/java/com/android/server/om/IdmapManager.java
 @@ -0,0 +1,116 @@
@@ -789,7 +789,7 @@ index 0000000..e2a3775
 +}
 diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
 new file mode 100644
-index 0000000..ec148dd
+index 00000000000..ec148dd9fa7
 --- /dev/null
 +++ b/services/core/java/com/android/server/om/OverlayManagerService.java
 @@ -0,0 +1,901 @@
@@ -1696,7 +1696,7 @@ index 0000000..ec148dd
 +}
 diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
 new file mode 100644
-index 0000000..2a0d88b
+index 00000000000..2a0d88b416d
 --- /dev/null
 +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
 @@ -0,0 +1,478 @@
@@ -2180,7 +2180,7 @@ index 0000000..2a0d88b
 +}
 diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java
 new file mode 100644
-index 0000000..af0bb64
+index 00000000000..af0bb64bd67
 --- /dev/null
 +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java
 @@ -0,0 +1,656 @@
@@ -2842,7 +2842,7 @@ index 0000000..af0bb64
 +}
 diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java
 new file mode 100644
-index 0000000..d6f5373
+index 00000000000..d6f53737913
 --- /dev/null
 +++ b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java
 @@ -0,0 +1,179 @@
@@ -3026,7 +3026,7 @@ index 0000000..d6f5373
 +    }
 +}
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 5a06bb3..cfc5a0e 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
 @@ -21450,6 +21450,47 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
@@ -3078,5 +3078,5 @@ index 5a06bb3..cfc5a0e 100644
  
      @Override
 -- 
-2.9.3
+2.11.1
 
index 2c75e7e9406dd4a18e8862e281abf1f74f5122db..b2666945ebc316842e35e232c97c2f0ed19525a3 100644 (file)
@@ -1,7 +1,7 @@
-From 88f2665cf9a811c5261aed2c200f05f5d36e1680 Mon Sep 17 00:00:00 2001
+From 2ad001347cfee56ced3c7515d42db82181ba2db8 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/44] OMS7-N: Integrate OverlayManagerService into framework
+Subject: [PATCH 03/45] OMS7-N: Integrate OverlayManagerService into framework
  [3/11]
 
 Hand over ownership of overlays to OverlayManagerService.
@@ -65,7 +65,7 @@ Change-Id: If0b1eaa690c38f9c33f7c8dc981314205a73fa9c
  21 files changed, 335 insertions(+), 480 deletions(-)
 
 diff --git a/cmds/idmap/Android.mk b/cmds/idmap/Android.mk
-index 50ccb07..eb6da18 100644
+index 50ccb07a382..eb6da18ea0a 100644
 --- a/cmds/idmap/Android.mk
 +++ b/cmds/idmap/Android.mk
 @@ -15,7 +15,7 @@
@@ -78,7 +78,7 @@ index 50ccb07..eb6da18 100644
  LOCAL_SHARED_LIBRARIES := liblog libutils libandroidfw
  
 diff --git a/cmds/idmap/idmap.cpp b/cmds/idmap/idmap.cpp
-index 3ab1915..d388977 100644
+index 3ab19155362..d388977e8e2 100644
 --- a/cmds/idmap/idmap.cpp
 +++ b/cmds/idmap/idmap.cpp
 @@ -13,8 +13,6 @@ SYNOPSIS \n\
@@ -172,7 +172,7 @@ index 3ab1915..d388977 100644
          return maybe_inspect(argv[2]);
      }
 diff --git a/cmds/idmap/idmap.h b/cmds/idmap/idmap.h
-index 8d4210b..5914de9 100644
+index 8d4210bcb44..5914de96a99 100644
 --- a/cmds/idmap/idmap.h
 +++ b/cmds/idmap/idmap.h
 @@ -25,12 +25,6 @@ int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path,
@@ -189,7 +189,7 @@ index 8d4210b..5914de9 100644
  
  #endif // _IDMAP_H_
 diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
-index 50479c8..389f342 100644
+index 50479c8e951..389f3422fb5 100644
 --- a/core/java/android/app/ActivityManagerNative.java
 +++ b/core/java/android/app/ActivityManagerNative.java
 @@ -16,6 +16,7 @@
@@ -244,7 +244,7 @@ index 50479c8..389f342 100644
              throws RemoteException {
          Parcel data = Parcel.obtain();
 diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
-index 2d22f26..55fc25d 100644
+index 2d22f26069f..55fc25de68b 100644
 --- a/core/java/android/app/ActivityThread.java
 +++ b/core/java/android/app/ActivityThread.java
 @@ -897,6 +897,14 @@ public final class ActivityThread {
@@ -328,7 +328,7 @@ index 2d22f26..55fc25d 100644
          if (configDiff != 0) {
              // Ask text layout engine to free its caches if there is a locale change
 diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java
-index 05d9d7e..47b05ee 100644
+index 05d9d7e412f..47b05eee470 100644
 --- a/core/java/android/app/ApplicationThreadNative.java
 +++ b/core/java/android/app/ApplicationThreadNative.java
 @@ -16,6 +16,7 @@
@@ -374,7 +374,7 @@ index 05d9d7e..47b05ee 100644
          Parcel data = Parcel.obtain();
          data.writeInterfaceToken(IApplicationThread.descriptor);
 diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
-index 5a4470b..c7522b9 100644
+index 5a4470b2ecd..c7522b9fc55 100644
 --- a/core/java/android/app/IActivityManager.java
 +++ b/core/java/android/app/IActivityManager.java
 @@ -266,6 +266,7 @@ public interface IActivityManager extends IInterface {
@@ -392,7 +392,7 @@ index 5a4470b..c7522b9 100644
 +    int UPDATE_ASSETS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 381;
  }
 diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java
-index 3fa88ae..fcc97e3 100644
+index 3fa88ae674a..fcc97e3d719 100644
 --- a/core/java/android/app/IApplicationThread.java
 +++ b/core/java/android/app/IApplicationThread.java
 @@ -104,6 +104,7 @@ public interface IApplicationThread extends IInterface {
@@ -410,7 +410,7 @@ index 3fa88ae..fcc97e3 100644
 +    int SCHEDULE_ASSETS_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+61;
  }
 diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
-index 4916c1c..8cbca31 100644
+index 4916c1c1f5c..8cbca31a66c 100644
 --- a/core/java/android/app/ResourcesManager.java
 +++ b/core/java/android/app/ResourcesManager.java
 @@ -29,6 +29,7 @@ import android.content.res.ResourcesImpl;
@@ -566,7 +566,7 @@ index 4916c1c..8cbca31 100644
      }
  }
 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index f2e3333..8d42d2c 100644
+index f2e3333b67d..8d42d2c590c 100644
 --- a/core/java/android/content/pm/PackageParser.java
 +++ b/core/java/android/content/pm/PackageParser.java
 @@ -668,10 +668,9 @@ public class PackageParser {
@@ -626,7 +626,7 @@ index f2e3333..8d42d2c 100644
              ai.protect = state.protectedComponents.size() > 0;
          }
 diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java
-index e64e4c4..4b276fb 100644
+index e64e4c4cc5e..4b276fb786f 100644
 --- a/core/java/android/content/pm/PackageUserState.java
 +++ b/core/java/android/content/pm/PackageUserState.java
 @@ -31,6 +31,8 @@ import android.util.ArraySet;
@@ -657,7 +657,7 @@ index e64e4c4..4b276fb 100644
                  ? new ArraySet<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,
@@ -770,7 +770,7 @@ index 1a7294f..6c5a88f 100644
      if (am == NULL) {
          jniThrowException(env, "java/lang/OutOfMemoryError", "");
 diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h
-index 2d5f4c2..c499103 100644
+index 2d5f4c2f90b..c4991032b73 100644
 --- a/include/androidfw/AssetManager.h
 +++ b/include/androidfw/AssetManager.h
 @@ -238,12 +238,10 @@ public:
@@ -826,7 +826,7 @@ index 2d5f4c2..c499103 100644
      private:
          void closeZip(int idx);
 diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
-index c0e8a98..b995457 100644
+index c0e8a980c2d..b9954573d79 100644
 --- a/libs/androidfw/AssetManager.cpp
 +++ b/libs/androidfw/AssetManager.cpp
 @@ -214,15 +214,6 @@ bool AssetManager::addAssetPath(
@@ -984,7 +984,7 @@ index c0e8a98..b995457 100644
   * Compute the zip file's index.
   *
 diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java
-index 90f507c..904c967 100644
+index 90f507c146b..904c967acdc 100644
 --- a/services/core/java/com/android/server/SystemServiceManager.java
 +++ b/services/core/java/com/android/server/SystemServiceManager.java
 @@ -16,6 +16,7 @@
@@ -1032,7 +1032,7 @@ index 90f507c..904c967 100644
       * Starts the specified boot phase for all system services that have been started up to
       * this point.
 diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index a3923b9..f4d07af 100644
+index a3923b94ef9..f4d07aff3e6 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
 @@ -19344,6 +19344,57 @@ public final class ActivityManagerService extends ActivityManagerNative
@@ -1094,7 +1094,7 @@ index a3923b9..f4d07af 100644
       * crash, etc dialogs.  The idea is that if there is no affordence to
       * press the on-screen buttons, or the user experience would be more
 diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
-index ec148dd..761ef52 100644
+index ec148dd9fa7..761ef5240ec 100644
 --- a/services/core/java/com/android/server/om/OverlayManagerService.java
 +++ b/services/core/java/com/android/server/om/OverlayManagerService.java
 @@ -676,37 +676,36 @@ public final class OverlayManagerService extends SystemService {
@@ -1166,7 +1166,7 @@ index ec148dd..761ef52 100644
  
      private void schedulePersistSettings() {
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index cfc5a0e..8954923 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
 @@ -400,17 +400,16 @@ public class PackageManagerService extends IPackageManager.Stub {
@@ -1385,7 +1385,7 @@ index cfc5a0e..8954923 100644
      }
  
 diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java
-index 75427a8..18c79cd 100644
+index 75427a8b75a..18c79cdda69 100644
 --- a/services/core/java/com/android/server/pm/PackageSettingBase.java
 +++ b/services/core/java/com/android/server/pm/PackageSettingBase.java
 @@ -21,6 +21,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED
@@ -1425,7 +1425,7 @@ index 75427a8..18c79cd 100644
          PackageUserState state = modifyUserStateComponents(userId, false, true);
          boolean changed = state.disabledComponents != null
 diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
-index 285b5bb..2b36e0e 100755
+index 285b5bbf3ec..2b36e0e0e4d 100755
 --- a/services/core/java/com/android/server/pm/Settings.java
 +++ b/services/core/java/com/android/server/pm/Settings.java
 @@ -813,6 +813,7 @@ final class Settings {
@@ -1454,7 +1454,7 @@ index 285b5bb..2b36e0e 100755
                  } else if (tagName.equals("preferred-activities")) {
                      readPreferredActivitiesLPw(parser, userId);
 diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
-index 6f21417..ab425c0 100644
+index 6f2141708ed..ab425c05e95 100644
 --- a/services/java/com/android/server/SystemServer.java
 +++ b/services/java/com/android/server/SystemServer.java
 @@ -85,6 +85,7 @@ import com.android.server.media.projection.MediaProjectionManagerService;
@@ -1476,5 +1476,5 @@ index 6f21417..ab425c0 100644
          // service, and permissions service, therefore we start it after them.
          startSensorService();
 -- 
-2.9.3
+2.11.1
 
index c0aa0cb53c32e5ef99cbd6f521088c85d5f29c49..aef281b93b57bf44a6b3f71f5f21f988cccefb33 100644 (file)
@@ -1,7 +1,7 @@
-From 1a224d9b41b2046fb7eaa26c57c75b9ba11574c9 Mon Sep 17 00:00:00 2001
+From ed383d26424a1787cbd06629d0b71a6858eb970d 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/44] OMS7-N: Set EXTRA_REPLACING correctly in
+Subject: [PATCH 04/45] OMS7-N: Set EXTRA_REPLACING correctly in
  ACTION_PACKAGE_ADDED [4/11]
 
 When broadcasting ACTION_PACKAGE_ADDED the recipients of the Intent are
@@ -35,7 +35,7 @@ Change-Id: Icf869013d5d652de4bf0f6df4529b7a68d35a25c
  1 file changed, 1 insertion(+)
 
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 8954923..3abcdbb 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
 @@ -1715,6 +1715,7 @@ public class PackageManagerService extends IPackageManager.Stub {
@@ -47,5 +47,5 @@ index 8954923..3abcdbb 100644
                  }
                  sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,
 -- 
-2.9.3
+2.11.1
 
index ae79d0577116c578153fc2c8bc5ea4caa5a7cb92..6fd73bcdb25691f715eef321a0e3602a48608f0c 100644 (file)
@@ -1,7 +1,7 @@
-From a27ed7bc2f1e2450d7febf07a8c0912233f89a8d Mon Sep 17 00:00:00 2001
+From f8889f2970a1abd1c4847035a6eda28a06486c3f 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/44] OMS7-N: idmap: suppress print for padded resources
+Subject: [PATCH 05/45] OMS7-N: idmap: suppress print for padded resources
  [5/11]
 
 Change-Id: I565ccf515068b96927e4317cc9c06543415bb324
@@ -10,7 +10,7 @@ Change-Id: I565ccf515068b96927e4317cc9c06543415bb324
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp
-index 924090f..cb52a39 100644
+index 924090fbb9d..cb52a394427 100644
 --- a/cmds/idmap/inspect.cpp
 +++ b/cmds/idmap/inspect.cpp
 @@ -289,7 +289,9 @@ namespace {
@@ -25,5 +25,5 @@ index 924090f..cb52a39 100644
          }
  
 -- 
-2.9.3
+2.11.1
 
index 5dc8f7ef8d9be34d99b9ce9207ed98bc9b495d1b..c8f3975461a3752a60f871b4a53fe89a63921f8d 100644 (file)
@@ -1,7 +1,7 @@
-From a40cb29e8ce6822cc93df52d1ed39d42fcacf402 Mon Sep 17 00:00:00 2001
+From 3f8902d99fc8e7b1d3d294349db065ed71f46936 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/44] OMS7-N: Fix memory leak during idmap creation [6/11]
+Subject: [PATCH 06/45] OMS7-N: Fix memory leak during idmap creation [6/11]
 
 Plug a memory leak in AssetManager::createIdmap.
 
@@ -11,7 +11,7 @@ Change-Id: Ieed805c596df931e2167ebb47c1b2907d6bf67f4
  1 file changed, 25 insertions(+), 13 deletions(-)
 
 diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
-index b995457..ef580e3 100644
+index b9954573d79..ef580e386ab 100644
 --- a/libs/androidfw/AssetManager.cpp
 +++ b/libs/androidfw/AssetManager.cpp
 @@ -291,22 +291,34 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk
@@ -63,5 +63,5 @@ index b995457..ef580e3 100644
  
  bool AssetManager::addDefaultAssets()
 -- 
-2.9.3
+2.11.1
 
index f206fe895b43f9b9e2d49bb86b796debf8a05608..1b66ed95815cdb9aea72092493c8a3035c007cca 100644 (file)
@@ -1,7 +1,7 @@
-From fcf5fb5a90e23fcc926ee57021f701a6690263e0 Mon Sep 17 00:00:00 2001
+From 77e70e046ea44a3fe57af2c53747f16d37df4c0b 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/44] OMS7-N: installd: add command 'rmidmap' [7/11]
+Subject: [PATCH 07/45] OMS7-N: installd: add command 'rmidmap' [7/11]
 
 Add an installd command to remove an idmap file. This is the inverse of
 the 'idmap' command and is intended for clean-up once an idmap file is
@@ -16,7 +16,7 @@ Change-Id: I58f55f643da99c0bd69136ee43c1c8c70c352797
  1 file changed, 7 insertions(+)
 
 diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
-index 2e18b1c..7f618b8 100644
+index 2e18b1c417f..7f618b8134b 100644
 --- a/services/core/java/com/android/server/pm/Installer.java
 +++ b/services/core/java/com/android/server/pm/Installer.java
 @@ -170,6 +170,13 @@ public final class Installer extends SystemService {
@@ -34,5 +34,5 @@ index 2e18b1c..7f618b8 100644
          assertValidInstructionSet(instructionSet);
          mInstaller.execute("rmdex", codePath, instructionSet);
 -- 
-2.9.3
+2.11.1
 
index 908dc34cd369a5c372492e3e4607d8fb58af282c..2d9332fa793205cf4da6d745710e388e197ee6d1 100644 (file)
@@ -1,7 +1,7 @@
-From 0fdefd8cada3c8f38865c4963b98c05768aca559 Mon Sep 17 00:00:00 2001
+From 30a80a1bc345caab58ccaf5e00c460ed43604540 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/44] OMS7-N: Disable Zygote preloaded drawables [8/11]
+Subject: [PATCH 08/45] OMS7-N: Disable Zygote preloaded drawables [8/11]
 
 With a theme applied, most of these preloaded drawables go unused.  Any
 assets the theme has redirected will need to be loaded with each app
@@ -19,7 +19,7 @@ Change-Id: I253b1a22482ac664c196533a4c2fcd88ae84b996
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
-index 20f84b5..455849e 100644
+index 20f84b52d19..455849e0c19 100644
 --- a/core/java/com/android/internal/os/ZygoteInit.java
 +++ b/core/java/com/android/internal/os/ZygoteInit.java
 @@ -108,7 +108,7 @@ public class ZygoteInit {
@@ -41,5 +41,5 @@ index 20f84b5..455849e 100644
              mResources.finishPreloading();
          } catch (RuntimeException e) {
 -- 
-2.9.3
+2.11.1
 
index fafc1f504f321428f767ecf43171000775e242d1..7e7d84495e2cb2bf9b38dcf8ed618e7ee1b539e2 100644 (file)
@@ -1,7 +1,7 @@
-From b6b118aaba00675b1975ef1d7bbf9316f5b3b0eb Mon Sep 17 00:00:00 2001
+From 5a3a75f20bb450999384f8a3d5bf91eb6f921ad5 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/44] OMS7-N: Persistence on boot through
+Subject: [PATCH 09/45] OMS7-N: Persistence on boot through
  OverlayManagerServiceImpl [9/11]
 
 Overlays should not be enforced by the traditional OverlayManagerService
@@ -14,7 +14,7 @@ Change-Id: Ic6eeb38b5e7bcec4211405d4504ba37a75738227
  1 file changed, 21 insertions(+), 10 deletions(-)
 
 diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
-index 2a0d88b..4c61968 100644
+index 2a0d88b416d..4c6196824cf 100644
 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
 @@ -402,34 +402,45 @@ final class OverlayManagerServiceImpl {
@@ -74,5 +74,5 @@ index 2a0d88b..4c61968 100644
  
      private void removeIdmapIfPossible(@NonNull final OverlayInfo oi) {
 -- 
-2.9.3
+2.11.1
 
index 7c7a6c201fa980e7720b1cd605719c8cf1f0ede4..e6fb58971018d361baa835d0fa000d0f588e246d 100644 (file)
@@ -1,7 +1,7 @@
-From e0ac8ddef5ab883b46bd4ca31574a3e295c001bb Mon Sep 17 00:00:00 2001
+From b3f1d015b1582b75c0d6c447d99fa2972a03f890 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/44] OMS7-N: Do not enforce code policy limiting overlay
+Subject: [PATCH 10/45] OMS7-N: Do not enforce code policy limiting overlay
  installation [10/11]
 
 Change-Id: Iea317f3771f25dbfcbf4938e88cace12fd97d7eb
@@ -10,7 +10,7 @@ Change-Id: Iea317f3771f25dbfcbf4938e88cace12fd97d7eb
  1 file changed, 4 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 3abcdbb..faaff1f 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
 @@ -8149,10 +8149,6 @@ public class PackageManagerService extends IPackageManager.Stub {
@@ -25,5 +25,5 @@ index 3abcdbb..faaff1f 100644
                  mCustomResolverComponentName.getPackageName().equals(pkg.packageName)) {
              setUpCustomResolverActivity(pkg);
 -- 
-2.9.3
+2.11.1
 
index 8ba3031eaa30f61ab54093f5be4ae14372bdaeaa..55fb6c708295b0f309035c03f25d94fafafd75f5 100644 (file)
@@ -1,7 +1,7 @@
-From d3735910edfaf506fd49adc6bfaacaa845965496 Mon Sep 17 00:00:00 2001
+From 7eb82b22b707e5a090ad1b6070621fdf8d2cfca8 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/44] OMS7-N: Implement multi-target enable/disable and
+Subject: [PATCH 11/45] OMS7-N: Implement multi-target enable/disable and
  disable-all [11/11]
 
 Just use the enable option like normal, but you can add more arguments
@@ -27,7 +27,7 @@ Change-Id: I04a595084a87b8260b5c534c4f5f111adbe154d7
  5 files changed, 161 insertions(+), 44 deletions(-)
 
 diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl
-index 4f5d960..8e349dc 100644
+index 4f5d96038d1..8e349dcf6ca 100644
 --- a/core/java/android/content/om/IOverlayManager.aidl
 +++ b/core/java/android/content/om/IOverlayManager.aidl
 @@ -83,10 +83,12 @@ interface IOverlayManager {
@@ -56,7 +56,7 @@ index 4f5d960..8e349dc 100644
 +    void refresh(in int uid);
  }
 diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
-index 761ef52..deb9046 100644
+index 761ef5240ec..deb9046a2d4 100644
 --- a/services/core/java/com/android/server/om/OverlayManagerService.java
 +++ b/services/core/java/com/android/server/om/OverlayManagerService.java
 @@ -255,7 +255,7 @@ public final class OverlayManagerService extends SystemService {
@@ -178,7 +178,7 @@ index 761ef52..deb9046 100644
          final boolean updateFrameworkRes = targetPackageNames.contains("android");
          if (updateFrameworkRes) {
 diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
-index 4c61968..c515640 100644
+index 4c6196824cf..c5156403b3f 100644
 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
 +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
 @@ -324,7 +324,7 @@ final class OverlayManagerServiceImpl {
@@ -222,7 +222,7 @@ index 4c61968..c515640 100644
      }
  
 diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java
-index af0bb64..935ea02 100644
+index af0bb64bd67..935ea02890b 100644
 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java
 +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java
 @@ -76,7 +76,7 @@ final class OverlayManagerSettings {
@@ -321,7 +321,7 @@ index af0bb64..935ea02 100644
      }
  
 diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java
-index d6f5373..44004c1 100644
+index d6f53737913..44004c140a4 100644
 --- a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java
 +++ b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java
 @@ -25,8 +25,10 @@ import android.os.ShellCommand;
@@ -466,5 +466,5 @@ index d6f5373..44004c1 100644
  
      private int runSetPriority() throws RemoteException {
 -- 
-2.9.3
+2.11.1
 
index f46e180bdc9981ecab348dde3582bee8741bd51f..97ab2850905b246d84e03a67f6560b00532a55fc 100644 (file)
@@ -1,7 +1,7 @@
-From 0d038faef60856f1cd5c5fe7a1873d47727c4a8d Mon Sep 17 00:00:00 2001
+From e428fe8691ab5d97c72ba1dc87a27611c49d64ef 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/44] Themes: Expose resolver hardcoded colors
+Subject: [PATCH 12/45] Themes: Expose resolver hardcoded colors
 
 commit dbbd5e70cc65002df41561474b03362022dd6716
 Author: Dave Kover <dkover@cyngn.com>
@@ -56,7 +56,7 @@ Change-Id: Iec7951147bbbc99aee6b06ae50c1acc7b9c01a7f
  create mode 100644 core/res/res/values/projekt_colors.xml
 
 diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml
-index d8dd447..78c2e05 100644
+index d8dd447e6a7..78c2e05f372 100644
 --- a/core/res/res/layout/chooser_grid.xml
 +++ b/core/res/res/layout/chooser_grid.xml
 @@ -31,7 +31,7 @@
@@ -87,7 +87,7 @@ index d8dd447..78c2e05 100644
                android:padding="32dp"
                android:gravity="center"
 diff --git a/core/res/res/layout/resolver_different_item_header.xml b/core/res/res/layout/resolver_different_item_header.xml
-index 5889136..201c8c6 100644
+index 58891363e20..201c8c686fe 100644
 --- a/core/res/res/layout/resolver_different_item_header.xml
 +++ b/core/res/res/layout/resolver_different_item_header.xml
 @@ -29,6 +29,6 @@
@@ -99,7 +99,7 @@ index 5889136..201c8c6 100644
      android:elevation="8dp"
      />
 diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml
-index c4e8e9c..1b6230a 100644
+index c4e8e9cb63b..1b6230a5a09 100644
 --- a/core/res/res/layout/resolver_list.xml
 +++ b/core/res/res/layout/resolver_list.xml
 @@ -30,7 +30,7 @@
@@ -139,7 +139,7 @@ index c4e8e9c..1b6230a 100644
          android:paddingBottom="8dp"
          android:paddingStart="12dp"
 diff --git a/core/res/res/layout/resolver_list_with_default.xml b/core/res/res/layout/resolver_list_with_default.xml
-index 02dc2ed..d3baf68 100644
+index 02dc2ede430..d3baf682fe0 100644
 --- a/core/res/res/layout/resolver_list_with_default.xml
 +++ b/core/res/res/layout/resolver_list_with_default.xml
 @@ -29,7 +29,7 @@
@@ -171,7 +171,7 @@ index 02dc2ed..d3baf68 100644
          android:divider="@null" />
 diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml
 new file mode 100644
-index 0000000..c6dbc1c
+index 00000000000..c6dbc1ca1c9
 --- /dev/null
 +++ b/core/res/res/values/projekt_colors.xml
 @@ -0,0 +1,20 @@
@@ -196,5 +196,5 @@ index 0000000..c6dbc1c
 +    <color name="resolver_list_bg">@color/white</color>
 +</resources>
 -- 
-2.9.3
+2.11.1
 
index c65675f0dee056ac6a5770d743562fb67a7898b3..6249d14ecfb449de9ab9f972852c9f90ea54a2be 100644 (file)
@@ -1,7 +1,7 @@
-From 0270217a8cd01fb3f177457dd7289e0d5937d42b Mon Sep 17 00:00:00 2001
+From fcb7a4329a95e2edc29986b27720b514a7235017 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/44] Themes: Allow Immersive cling colors to be fully themed
+Subject: [PATCH 13/45] Themes: Allow Immersive cling colors to be fully themed
 
 This allows the immersive mode help tooltip to be themed completely by
 removing hardcoded framework calls. Let the themer decide what they want
@@ -14,7 +14,7 @@ Change-Id: Ia0927fda5e44a3ce8ef699cb018bea9b9e7ace62
  2 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/core/res/res/layout/immersive_mode_cling.xml b/core/res/res/layout/immersive_mode_cling.xml
-index b08b0f4..6dbde20 100644
+index b08b0f4d59c..6dbde20d481 100644
 --- a/core/res/res/layout/immersive_mode_cling.xml
 +++ b/core/res/res/layout/immersive_mode_cling.xml
 @@ -16,7 +16,7 @@
@@ -65,7 +65,7 @@ index b08b0f4..6dbde20 100644
 \ No newline at end of file
 +</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 @@
@@ -77,5 +77,5 @@ index c6dbc1c..7408ae9 100644
 +    <color name="immersive_cling_button_text_color">@android:color/white</color>
  </resources>
 -- 
-2.9.3
+2.11.1
 
index bdba7c2214f989c065b2d086914808b8b949ad96..6d89bff1b13121eadbefe21cdbf21ea8eb89fcd4 100644 (file)
@@ -1,7 +1,7 @@
-From 66f7123b3f0f9f303ce85c742c1feccfc1ced792 Mon Sep 17 00:00:00 2001
+From d4e7c67ed53aed6475555c7ed5bf6660aa92fcd3 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/44] Themes: Allow Permission Icons to be fully themed
+Subject: [PATCH 14/45] Themes: Allow Permission Icons to be fully themed
 
 This removes the forced @android:color/black tint on the permission
 icons during app sideload through PackageInstaller.
@@ -17,7 +17,7 @@ Change-Id: I31eb5021a6d297997dbba156f98cbf47f2102b6c
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/core/res/res/layout/app_permission_item.xml b/core/res/res/layout/app_permission_item.xml
-index 383d771..a80d40e 100644
+index 383d771074e..a80d40efd2b 100644
 --- a/core/res/res/layout/app_permission_item.xml
 +++ b/core/res/res/layout/app_permission_item.xml
 @@ -32,7 +32,7 @@
@@ -30,7 +30,7 @@ index 383d771..a80d40e 100644
      <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 @@
@@ -40,5 +40,5 @@ index 7408ae9..a7316ab 100644
 +    <color name="app_permission_icon_tint">@android:color/black</color>
  </resources>
 -- 
-2.9.3
+2.11.1
 
index 6eb1e2c35ce4f7570ede3a6e48cefe3adda092ea..07c881062ff2cb624e822d5fa346942de4508ccd 100644 (file)
@@ -1,7 +1,7 @@
-From 425642e9223a14abddea7e34618ae3f6b5385e36 Mon Sep 17 00:00:00 2001
+From 88b94c2fb97f178d8c56ab85fbbbdb074d525011 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/44] Themes: Allow Navbar ripple color to be themed
+Subject: [PATCH 15/45] Themes: Allow Navbar ripple color to be themed
 
 PS1:
 Layers Commit by @setiawanjimmy
@@ -18,7 +18,7 @@ Change-Id: I7969e952d7e08f1d12e89291512312421585b70f
 
 diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
 new file mode 100644
-index 0000000..a0f1df0
+index 00000000000..a0f1df06b6a
 --- /dev/null
 +++ b/packages/SystemUI/res/values/projekt_colors.xml
 @@ -0,0 +1,21 @@
@@ -44,7 +44,7 @@ index 0000000..a0f1df0
 +    <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 {
@@ -69,5 +69,5 @@ index 57e092a..2579579 100644
          return mRipplePaint;
      }
 -- 
-2.9.3
+2.11.1
 
index c15cf30a51b22e4d6fccc3cafd91dba62981e798..162918e0a806298c6800a14dd9bc0a4dfc11115e 100644 (file)
@@ -1,7 +1,7 @@
-From 2a48eb8da1a13d2302e23363efb1473d015d1f86 Mon Sep 17 00:00:00 2001
+From 5a3026dde3ee562bdee02c60aebf979439c4691d 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/44] SystemUI: Expose QS edit item decoration background
+Subject: [PATCH 16/45] SystemUI: Expose QS edit item decoration background
  color
 
 PS2:
@@ -16,7 +16,7 @@ Change-Id: I9867ca26e7d9dacad37d2b70180a98fede0fb0e8
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index a0f1df0..42f4a15 100644
+index a0f1df06b6a..42f4a1568df 100644
 --- a/packages/SystemUI/res/values/projekt_colors.xml
 +++ b/packages/SystemUI/res/values/projekt_colors.xml
 @@ -18,4 +18,6 @@
@@ -27,7 +27,7 @@ index a0f1df0..42f4a15 100644
 +    <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
@@ -54,5 +54,5 @@ index 8d7f6ee..c7a1441 100644
                  mDrawable.setBounds(0, top, width, bottom);
                  mDrawable.draw(c);
 -- 
-2.9.3
+2.11.1
 
index 6bcd50b6c54755d0e87e916d116c8fdfc5cf8b13..6b512b1a8d67dc4958fcf74e5e3d914200065dc0 100644 (file)
@@ -1,7 +1,7 @@
-From db1dd6cb157f002aa6c60d2d9c99d9045758db84 Mon Sep 17 00:00:00 2001
+From 7d58a5685b68031f2d79f3864fd19bf768ece4ee 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/44] Allow custom alpha for notification shade bg color
+Subject: [PATCH 17/45] Allow custom alpha for notification shade bg color
 
 Change-Id: If621df83d994feae0448a734408ba85ac8329325
 ---
@@ -9,7 +9,7 @@ Change-Id: If621df83d994feae0448a734408ba85ac8329325
  1 file changed, 27 insertions(+), 13 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
-index a6fe438..5cf0e0a 100644
+index a6fe4382475..5cf0e0a1e10 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
 @@ -430,19 +430,33 @@ public class NotificationStackScrollLayout extends ViewGroup
@@ -60,5 +60,5 @@ index a6fe438..5cf0e0a 100644
          invalidate();
      }
 -- 
-2.9.3
+2.11.1
 
index 90a486bf9364b41e5247683227ce855307f4bc2c..e5f9be0c5031ae17456b1e3ab94451fca6f79e42 100644 (file)
@@ -1,7 +1,7 @@
-From 4a835c1782a74f73bf44be58aa5e6269badbbe4d Mon Sep 17 00:00:00 2001
+From e8f79d55a9f209da2be2cd2c6eeeb5c040c0105b 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/44] Themes: Expose various QuickSettings text colors
+Subject: [PATCH 18/45] Themes: Expose various QuickSettings text colors
 
 Change-Id: Iaea71ca83afbc3d8cc6faea6afac16cabb46cfff
 ---
@@ -11,7 +11,7 @@ Change-Id: Iaea71ca83afbc3d8cc6faea6afac16cabb46cfff
  3 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SystemUI/res/layout/qs_customize_panel_content.xml b/packages/SystemUI/res/layout/qs_customize_panel_content.xml
-index 04d0e65..9c23250 100644
+index 04d0e6524ea..9c232502651 100644
 --- a/packages/SystemUI/res/layout/qs_customize_panel_content.xml
 +++ b/packages/SystemUI/res/layout/qs_customize_panel_content.xml
 @@ -23,7 +23,8 @@
@@ -25,7 +25,7 @@ index 04d0e65..9c23250 100644
      <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 @@
@@ -38,7 +38,7 @@ index 1b47d4b..dca8afb 100644
          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 @@
@@ -51,5 +51,5 @@ index 42f4a15..0f89199 100644
 +    <color name="qs_edit_toolbar_text_color">#FFFFFF</color>
  </resources>
 -- 
-2.9.3
+2.11.1
 
index 0606e24c77d507c452354e87b446839d95014ba5..e77339fbd6e80888171965fb68207d6e62e34276 100644 (file)
@@ -1,7 +1,7 @@
-From 41ab365045aba18537b51505a201a33d74a8944d Mon Sep 17 00:00:00 2001
+From bb216afed77d1c7349149df59ba5eca0445002b2 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/44] Notifications: Expose a bool to disable dynamic colors
+Subject: [PATCH 19/45] Notifications: Expose a bool to disable dynamic colors
 
 This commit allows a themer to overlay a boolean value in config.xml to
 disable dynamic colors applied to the app title and app icon of each
@@ -22,7 +22,7 @@ Change-Id: I3c7828118991ec4fc616011caf073c81f75428b4
  create mode 100644 core/res/res/values/projekt_symbols.xml
 
 diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
-index 9f217d4..55029aa 100644
+index 9f217d48aa8..55029aad4ae 100644
 --- a/core/java/android/app/Notification.java
 +++ b/core/java/android/app/Notification.java
 @@ -29,6 +29,7 @@ import android.content.pm.ApplicationInfo;
@@ -85,7 +85,7 @@ index 9f217d4..55029aa 100644
              }
              CharSequence text = m.mText == null ? "" : m.mText;
 diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml
-index a7316ab..d17fbba 100644
+index a7316ab979c..d17fbba053d 100644
 --- a/core/res/res/values/projekt_colors.xml
 +++ b/core/res/res/values/projekt_colors.xml
 @@ -21,4 +21,6 @@
@@ -97,7 +97,7 @@ index a7316ab..d17fbba 100644
  </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 @@
@@ -128,7 +128,7 @@ index 0000000..f6eb90a
 +</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 @@
@@ -158,5 +158,5 @@ index 0000000..f597a5f
 +
 +</resources>
 -- 
-2.9.3
+2.11.1
 
index b01f3990da90f3d8fa8a4c0022b066eb49459339..ecc6acefa5ac9897cb7b46d3f8ac9a4461bb84fc 100644 (file)
@@ -1,7 +1,7 @@
-From ae4223f3c318ecfbc738c2d632a413a11c10e98a Mon Sep 17 00:00:00 2001
+From 258c2c2b1ceaa81888604097249b28a3723834ff 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/44] Notification dynamic colors bool compatible with OMS7
+Subject: [PATCH 20/45] Notification dynamic colors bool compatible with OMS7
 
 OMS7 introduced this fine piece of code: https://github.com/SubstratumResources/platform_frameworks_base/blob/n-oms7/core/java/android/app/ResourcesManager.java#L897..#L904
 
@@ -22,7 +22,7 @@ Change-Id: I02efe27de3cc7067552964ffbaf079f9e9b5bc3e
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
-index 55029aa..67c2132 100644
+index 55029aad4ae..67c2132b667 100644
 --- a/core/java/android/app/Notification.java
 +++ b/core/java/android/app/Notification.java
 @@ -3918,7 +3918,7 @@ public class Notification implements Parcelable
@@ -44,5 +44,5 @@ index 55029aa..67c2132 100644
              }
  
 -- 
-2.9.3
+2.11.1
 
index ab834b78a767139080113babb6b90a8f90845dc0..55cdf548527870163212c059cee7dd19dd03da99 100644 (file)
@@ -1,7 +1,7 @@
-From 8d44b632200a6ea720ec51eff9ba9dfad45eef07 Mon Sep 17 00:00:00 2001
+From edd465d7af676b267a995312f615bf76d7cc4661 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/44] Allow prevention of doze notification color inversion
+Subject: [PATCH 21/45] Allow prevention of doze notification color inversion
 
 Removed empty newline at the end -- KreAch3R
 Removed slims files for aosp roms -- Bgill55
@@ -14,7 +14,7 @@ Change-Id: I2d361c34904f3d168894b8b1741456319fd68456
  3 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml
-index f6eb90a..5234959 100644
+index f6eb90a49eb..5234959fc9e 100644
 --- a/core/res/res/values/projekt_config.xml
 +++ b/core/res/res/values/projekt_config.xml
 @@ -22,4 +22,9 @@
@@ -28,7 +28,7 @@ index f6eb90a..5234959 100644
 +
  </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 @@
@@ -40,7 +40,7 @@ index f597a5f..16a5728 100644
 +
  </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;
@@ -62,5 +62,5 @@ index 2c96e31..65fd115 100644
              for (int i = 0; i < mTargets.size(); i++) {
                  mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
 -- 
-2.9.3
+2.11.1
 
index bab7b98ebbf0885d95603cf12e4fdd76160e0c5b..16d31f7ddabf80d106a06679a808bcbd0120725f 100644 (file)
@@ -1,7 +1,7 @@
-From 4040a5fa9e8f23c423c0023d0ea5d6214e568634 Mon Sep 17 00:00:00 2001
+From ce6c1809f6799b640de8eeee4cc5181f2d558206 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/44] OMS7 compatible 'Ambient notification inversion'
+Subject: [PATCH 22/45] OMS7 compatible 'Ambient notification inversion'
 
 OMS7 introduced this fine piece of code: https://github.com/SubstratumResources/platform_frameworks_base/blob/n-oms7/core/java/android/app/ResourcesManager.java#L897..#L904
 
@@ -22,7 +22,7 @@ Change-Id: I80ad5d037004f0dc63d9eb746c3af05e59a8834e
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
-index 65fd115..605f381 100644
+index 65fd1158b95..605f381e9e2 100644
 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
 +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
 @@ -20,7 +20,6 @@ import android.animation.Animator;
@@ -60,5 +60,5 @@ index 65fd115..605f381 100644
              for (int i = 0; i < mTargets.size(); i++) {
                  mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
 -- 
-2.9.3
+2.11.1
 
index e46a000526a88103ff9b72da269dec10309c96d8..a02dd606b56569a2b30c77ddff801f4932a19df4 100644 (file)
@@ -1,7 +1,7 @@
-From 5c488c2096386c1e87addd0b95d6541a4524fc3a Mon Sep 17 00:00:00 2001
+From 5beb75233e577eb6cd6c4bbeb888bc866d89ac93 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/44] SystemUI: Use own drawables for QS expand icon
+Subject: [PATCH 23/45] SystemUI: Use own drawables for QS expand icon
 
 This was using the volume panel drawables used also on volume panel.
 So with this commit themers can give different icon for either QS
@@ -38,7 +38,7 @@ Change-Id: Ice8d8a520b9b22ba773cceb885e11c8a4bbf6d5f
 
 diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml
 new file mode 100644
-index 0000000..443f2a6
+index 00000000000..443f2a651e5
 --- /dev/null
 +++ b/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml
 @@ -0,0 +1,25 @@
@@ -70,7 +70,7 @@ index 0000000..443f2a6
 \ No newline at end of file
 diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml
 new file mode 100644
-index 0000000..b73cdca
+index 00000000000..b73cdcad154
 --- /dev/null
 +++ b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml
 @@ -0,0 +1,26 @@
@@ -102,7 +102,7 @@ index 0000000..b73cdca
 +</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 @@
@@ -134,7 +134,7 @@ index 0000000..91c83fc
 +</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 @@
@@ -166,7 +166,7 @@ index 0000000..e43e645
 \ No newline at end of file
 diff --git a/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml
 new file mode 100644
-index 0000000..493bdae
+index 00000000000..493bdae7900
 --- /dev/null
 +++ b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml
 @@ -0,0 +1,26 @@
@@ -198,7 +198,7 @@ index 0000000..493bdae
 +</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 @@
@@ -230,7 +230,7 @@ index 0000000..58e485c
 +</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 @@
@@ -298,7 +298,7 @@ index 0000000..bba6b7f
 +</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 @@
@@ -333,7 +333,7 @@ index 0000000..8138b2e
 +</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 @@
@@ -401,7 +401,7 @@ index 0000000..bb22064
 +</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 @@
@@ -436,7 +436,7 @@ index 0000000..b561ee0
 +</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 @@
@@ -459,7 +459,7 @@ index 0000000..c3930e4
 +    android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" />
 diff --git a/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml
 new file mode 100644
-index 0000000..c3930e4
+index 00000000000..c3930e42cda
 --- /dev/null
 +++ b/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml
 @@ -0,0 +1,17 @@
@@ -481,7 +481,7 @@ index 0000000..c3930e4
 +<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 {
@@ -501,5 +501,5 @@ index a295cfa..0f04c28 100644
      }
  
 -- 
-2.9.3
+2.11.1
 
index e5ab181b4c40f27b668c52fcd21852f8504fb61b..b4ee0115e6828808886a9c85346ddd902822cd92 100644 (file)
@@ -1,7 +1,7 @@
-From 042bd738c1cb8c42a724539977988ad8b863dae9 Mon Sep 17 00:00:00 2001
+From c8d48b032e7a0541fc2909c6f448ff3a0f01c59f Mon Sep 17 00:00:00 2001
 From: 0xD34D <clark@scheffsblend.com>
 Date: Mon, 9 Jan 2017 07:19:41 +0530
-Subject: [PATCH 24/44] N-Extras: Add dynamic theme BootAnimation support
+Subject: [PATCH 24/45] N-Extras: Add dynamic theme BootAnimation support
 
 Extracted from "Themes: Port to CM13 [1/3]"
 http://review.cyanogenmod.org/#/c/113273/14
@@ -13,7 +13,7 @@ Change-Id: I394897c10f02695f0416e87e9bf960e840bcb3b7
  2 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
-index d4a9326..dfa70e3 100644
+index d4a9326fc0d..dfa70e3e44c 100644
 --- a/cmds/bootanimation/BootAnimation.cpp
 +++ b/cmds/bootanimation/BootAnimation.cpp
 @@ -68,6 +68,7 @@ namespace android {
@@ -53,7 +53,7 @@ index d4a9326..dfa70e3 100644
          mZipFileName = getAnimationFileName(IMG_OEM);
      }
 diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
-index c0ae6b6..e779246 100644
+index c0ae6b6edb1..e779246da46 100644
 --- a/cmds/bootanimation/BootAnimation.h
 +++ b/cmds/bootanimation/BootAnimation.h
 @@ -114,8 +114,9 @@ private:
@@ -68,5 +68,5 @@ index c0ae6b6..e779246 100644
      status_t initTexture(Texture* texture, AssetManager& asset, const char* name);
      status_t initTexture(const Animation::Frame& frame);
 -- 
-2.9.3
+2.11.1
 
index 7d7feb6da344c4338143546d7db152ad3a592bbf..ab6df52b11105f4d972649524c74642458ca3575 100644 (file)
@@ -1,7 +1,7 @@
-From 397cd6d8b76e2b84dc80d142066d143d61d8a4f4 Mon Sep 17 00:00:00 2001
+From 5dae5610d22e8fc2cc85c454f07d01b6902e6927 Mon Sep 17 00:00:00 2001
 From: 0xD34D <clark@scheffsblend.com>
 Date: Wed, 22 Jun 2016 23:54:23 +0300
-Subject: [PATCH 25/44] N-Extras: Add dynamic theme fonts support
+Subject: [PATCH 25/45] N-Extras: Add dynamic theme fonts support
 
 Due to the nature of the removal of assetSeq in OMS7+, we now use the
 more controllable font scale updating code to update the fonts on
@@ -53,7 +53,7 @@ Change-Id: I1f61bd269b42ab6145482a51d25fe5b1b5308f94
  8 files changed, 240 insertions(+), 27 deletions(-)
 
 diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
-index 55fc25d..44a900b 100644
+index 55fc25de68b..44a900b3a1f 100644
 --- a/core/java/android/app/ActivityThread.java
 +++ b/core/java/android/app/ActivityThread.java
 @@ -48,6 +48,7 @@ import android.database.sqlite.SQLiteDebug;
@@ -79,7 +79,7 @@ index 55fc25d..44a900b 100644
              }
          }
 diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
-index 5a09c00..42febcf 100644
+index 5a09c0028cd..42febcfe59c 100644
 --- a/core/java/android/content/pm/ActivityInfo.java
 +++ b/core/java/android/content/pm/ActivityInfo.java
 @@ -624,6 +624,11 @@ public class ActivityInfo extends ComponentInfo
@@ -95,7 +95,7 @@ index 5a09c00..42febcf 100644
       * can itself handle changes to the font scaling factor.  Set from the
       * {@link android.R.attr#configChanges} attribute.  This is
 diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
-index b2d518c..2f7c3ec 100644
+index b2d518c56ca..2f7c3ec18dc 100644
 --- a/core/java/android/content/res/Configuration.java
 +++ b/core/java/android/content/res/Configuration.java
 @@ -955,6 +955,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
@@ -125,7 +125,7 @@ index b2d518c..2f7c3ec 100644
  
      /**
 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 {
@@ -161,7 +161,7 @@ index e1b7fda..6dcd045 100644
  
              //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;
@@ -203,7 +203,7 @@ index 85d84bb..81257f0 100644
                      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;
@@ -310,7 +310,7 @@ index 7871aa8..f4590c9 100644
          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 @@
@@ -560,7 +560,7 @@ index 2886f0d..990c9bd 100644
      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 f4d07af..5d8ab51 100644
+index f4d07aff3e6..5d8ab51d077 100644
 --- a/services/core/java/com/android/server/am/ActivityManagerService.java
 +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
 @@ -513,6 +513,8 @@ public final class ActivityManagerService extends ActivityManagerNative
@@ -596,5 +596,5 @@ index f4d07af..5d8ab51 100644
              Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
  
 -- 
-2.9.3
+2.11.1
 
index c815ec78d43c963bb358195a0fdb8406c2c6b914..a0a51adcdd5111f9323bd03609f4330c74ec830b 100644 (file)
@@ -1,7 +1,7 @@
-From 3aa52c4d1f1cb561de907163ef438df9f4897d45 Mon Sep 17 00:00:00 2001
+From 5c967e6492f96e01816b23f9561836cd6c0e4c8b 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/44] N-Extras: AudioService: Allow system effect sounds to
+Subject: [PATCH 26/45] N-Extras: AudioService: Allow system effect sounds to
  be themed
 
 This commit checks whether there is a preexisting file in the themed
@@ -17,7 +17,7 @@ Change-Id: I7666c2bd259443ccec442bf6059786bea3dc069e
  1 file changed, 21 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
-index f5db488..c6144d0 100644
+index f5db48806de..c6144d0b0b9 100644
 --- a/services/core/java/com/android/server/audio/AudioService.java
 +++ b/services/core/java/com/android/server/audio/AudioService.java
 @@ -123,6 +123,7 @@ import com.android.server.pm.UserManagerService;
@@ -75,5 +75,5 @@ index f5db488..c6144d0 100644
                          mediaPlayer.setAudioStreamType(AudioSystem.STREAM_SYSTEM);
                          mediaPlayer.prepare();
 -- 
-2.9.3
+2.11.1
 
index 5db820eb70f0a51fa97eb2b28e83e43008916a5d..5a71108f08739720fc041b02c01e6f4486890d24 100644 (file)
@@ -1,7 +1,7 @@
-From 943c3e2f786f07343334f605722d900cde029843 Mon Sep 17 00:00:00 2001
+From b78103f1cc4026e0a3abd3c797353e27a0338c3d 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/44] OMS7-N: ApplicationsState: add filter for Substratum
+Subject: [PATCH 27/45] OMS7-N: ApplicationsState: add filter for Substratum
  overlays [1/2]
 
 This commit allows the framework to handle the filtering of the
@@ -13,7 +13,7 @@ Change-Id: I7646115e8f73494d726728fac58cc47aafd69d5d
  1 file changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
-index f0ec107..6fecd40 100644
+index f0ec1078650..6fecd4044ca 100644
 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
 +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
 @@ -137,9 +137,11 @@ public class ApplicationsState {
@@ -49,5 +49,5 @@ index f0ec107..6fecd40 100644
          private int mCurrentUser;
  
 -- 
-2.9.3
+2.11.1
 
index a521e4abb37566460faf4d5e1866fa1c37ad278c..5e88fabc9bbd98cf68c5bcab021b538806a535a9 100644 (file)
@@ -1,7 +1,7 @@
-From 0403260834d8f01960e9f8ea7354596eddef3be0 Mon Sep 17 00:00:00 2001
+From 3475d1a7cbb8dbfefd702d20c1117e38b794ad74 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/44] OMS7-N: ApplicationsState: add filter for Substratum
+Subject: [PATCH 28/45] OMS7-N: ApplicationsState: add filter for Substratum
  icon overlays [1/2]
 
 This commit allows the framework to handle the filtering of the icon overlays found for OMS.
@@ -15,7 +15,7 @@ Change-Id: I594c993977733e67f566ac65df50ad2e1bbdbdd3
  1 file changed, 11 insertions(+)
 
 diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
-index 6fecd40..d3a6e21 100644
+index 6fecd4044ca..d3a6e217735 100644
 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
 +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
 @@ -1325,6 +1325,17 @@ public class ApplicationsState {
@@ -37,5 +37,5 @@ index 6fecd40..d3a6e21 100644
          private int mCurrentUser;
  
 -- 
-2.9.3
+2.11.1
 
index 6879590acd32a6b524f0a0c7197b4c19728293b9..bc31d9e42985c1f37218dc0ba53918ff94f69055 100644 (file)
@@ -1,7 +1,7 @@
-From a60d2fea89df8eecd7af96a58f8fbc3624d1b8bf Mon Sep 17 00:00:00 2001
+From da6d7a0af5b508354da61897b8cf96ca7b3b8cb4 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/44] Themes: Expose QS battery
+Subject: [PATCH 29/45] Themes: Expose QS battery
 
 This is needed for white themes like Belo. Should function the same with dark themes as well.
 
@@ -12,7 +12,7 @@ Change-Id: I65e3f777a2a2605a06260705f92f8617407d9005
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml
-index 8abfcf6..af3acdc 100644
+index 8abfcf6057a..af3acdc5c53 100644
 --- a/packages/SystemUI/res/layout/battery_detail.xml
 +++ b/packages/SystemUI/res/layout/battery_detail.xml
 @@ -27,7 +27,7 @@
@@ -36,7 +36,7 @@ index 8abfcf6..af3acdc 100644
      <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 @@
@@ -51,5 +51,5 @@ index 0f89199..83b8524 100644
 +    <color name="qs_battery_accent">@*android:color/accent_device_default_light</color>
  </resources>
 -- 
-2.9.3
+2.11.1
 
index e65c8d2f090eabb44d5ec51c153fa642ced3e9a9..7d9db5fb84c4a56fa2bb708ebd8ff5a9918f67f8 100644 (file)
@@ -1,7 +1,7 @@
-From e4837e24107e06a75dcd06981aa3e04bfa6948fa Mon Sep 17 00:00:00 2001
+From 30aa3f06924819530a7074d17f7be91c419c24da 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/44] OMS: Introduce MODIFY_OVERLAYS permission for user apps
+Subject: [PATCH 30/45] OMS: Introduce MODIFY_OVERLAYS permission for user apps
 
 This permission will grant the app read and write permissions
 to access OverlayManagerService. If caller does not posess
@@ -16,7 +16,7 @@ Change-Id: Ib6b10b516577f338aee31e759bfd16278f902c20
  3 files changed, 29 insertions(+), 8 deletions(-)
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 6a5bd39..3ceb17b 100644
+index 6a5bd3946db..3ceb17ba568 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -3162,6 +3162,12 @@
@@ -33,7 +33,7 @@ index 6a5bd39..3ceb17b 100644
                   android:persistent="true"
                   android:hasCode="false"
 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index 1823629..d0923cc 100755
+index 1823629341c..d0923ccf6dc 100755
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
 @@ -1411,6 +1411,11 @@
@@ -49,7 +49,7 @@ index 1823629..d0923cc 100755
  
      <!-- 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;
@@ -116,5 +116,5 @@ index deb9046..e205ce1 100644
          }
  
 -- 
-2.9.3
+2.11.1
 
index 7f5be688a1f86b5b3310a54e4c00e2ebb9a552ab..cd3006c4d22904baddf395429ffe4e9e251fcc53 100644 (file)
@@ -1,7 +1,7 @@
-From 78d15ca661f48f1d811fc760a4d90dd74179240b Mon Sep 17 00:00:00 2001
+From ab15da5ba451f9812fc074479bd1d045c9c8afcc Mon Sep 17 00:00:00 2001
 From: daveyannihilation <daveyannihilation@hotmail.com>
 Date: Sun, 1 Jan 2017 01:47:53 -0700
-Subject: [PATCH 31/44] SystemUI: Expose switch bar title
+Subject: [PATCH 31/45] SystemUI: Expose switch bar title
 
 This is needed for the power notifications switchbar in SystemUI Tuner, amongst other things.
 
@@ -13,7 +13,7 @@ Change-Id: I86f04840c2be46519509556b8d0061cefe26f631
  create mode 100644 packages/SystemUI/res/values/projekt_styles.xml
 
 diff --git a/packages/SystemUI/res/layout/switch_bar.xml b/packages/SystemUI/res/layout/switch_bar.xml
-index 41cdb78..344c5aa 100644
+index 41cdb78392a..344c5aa0531 100644
 --- a/packages/SystemUI/res/layout/switch_bar.xml
 +++ b/packages/SystemUI/res/layout/switch_bar.xml
 @@ -33,8 +33,7 @@
@@ -28,7 +28,7 @@ index 41cdb78..344c5aa 100644
  
 diff --git a/packages/SystemUI/res/values/projekt_styles.xml b/packages/SystemUI/res/values/projekt_styles.xml
 new file mode 100644
-index 0000000..f49834b
+index 00000000000..f49834bc202
 --- /dev/null
 +++ b/packages/SystemUI/res/values/projekt_styles.xml
 @@ -0,0 +1,24 @@
@@ -57,5 +57,5 @@ index 0000000..f49834b
 +</resources>
 +
 -- 
-2.9.3
+2.11.1
 
index 072b263e633a07e90cd4016620b0a694034a20cf..576d197149357551e94c7be47554155487bbdef9 100644 (file)
@@ -1,7 +1,7 @@
-From 5d0bab85243ef8c14d99b88879925745c906af83 Mon Sep 17 00:00:00 2001
+From b1cbf5224969aaf156e24c5e56ef1cb5d7a541dc 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/44] Themes: Expose manifest styles for themes
+Subject: [PATCH 32/45] Themes: Expose manifest styles for themes
 
 Change-Id: Ie3a4fdead4f4fa1c121018b38de1c86a05bbcff2
 ---
@@ -11,7 +11,7 @@ Change-Id: Ie3a4fdead4f4fa1c121018b38de1c86a05bbcff2
  create mode 100644 core/res/res/values/projekt_styles.xml
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 3ceb17b..36df6ea 100644
+index 3ceb17ba568..36df6eac13e 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -3214,7 +3214,7 @@
@@ -101,7 +101,7 @@ index 3ceb17b..36df6ea 100644
          </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 @@
@@ -147,5 +147,5 @@ index 0000000..e5fe635
 +
 +</resources>
 -- 
-2.9.3
+2.11.1
 
index 79da00424f4a3b1902175fabe10d3214d68955f3..fdf47b1f932ef89c9f356eba4cac448811466f20 100644 (file)
@@ -1,7 +1,7 @@
-From 086081173e84533937aa0d6898a609b48103ec7b Mon Sep 17 00:00:00 2001
+From 6cce771b443b13957f9419fdaccfbda365c8860d Mon Sep 17 00:00:00 2001
 From: mickybart <mickybart@pygoscelis.org>
 Date: Sat, 19 Nov 2016 19:05:05 -0500
-Subject: [PATCH 33/44] OMS: StrictMode and files under /data/system/theme/
+Subject: [PATCH 33/45] OMS: StrictMode and files under /data/system/theme/
 
 Themes are using /data/system/theme/ to push some files like LowBattery.ogg (audio notification)
 When the device battery trigger the low battery state, the sound is not played due
@@ -22,7 +22,7 @@ Change-Id: I154dc4280de8eaf891772a9632283e9f547f5718
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
-index 67378bd..4fb189e 100644
+index 67378bd0cd8..4fb189e85c1 100644
 --- a/core/java/android/net/Uri.java
 +++ b/core/java/android/net/Uri.java
 @@ -2342,7 +2342,8 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
@@ -36,5 +36,5 @@ index 67378bd..4fb189e 100644
          }
      }
 -- 
-2.9.3
+2.11.1
 
index 425d1476b2d49738ce8e1bfb7d89f41a3d07a22b..d7df6e1a624258a4128f27e1d129496abbaf8213 100644 (file)
@@ -1,7 +1,7 @@
-From 7d8713e9763e72ce1ecb42e8f715b87314b3962b Mon Sep 17 00:00:00 2001
+From e454e7470e0cf92f43e0bb600e555aadc974573d 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/44] doze: allow grayscale even if invert boolean is false
+Subject: [PATCH 34/45] doze: allow grayscale even if invert boolean is false
 
 for dark themes, we are setting the config boolean for inverting
     doze notifications to false.  in addition to preventing
@@ -17,7 +17,7 @@ Change-Id: Ifc5efbccbeb02910684b76793721b10f1d64f870
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
-index 605f381..16d46c0 100644
+index 605f381e9e2..16d46c0362e 100644
 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
 +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
 @@ -92,7 +92,7 @@ public class ViewInvertHelper {
@@ -41,5 +41,5 @@ index 605f381..16d46c0 100644
  
      public void setInverted(boolean invert, boolean fade, long delay) {
 -- 
-2.9.3
+2.11.1
 
index d23c5d5e4bfd16c120f3167ee79b90487f58d23d..0c56c054bc88aae4c57c3bc3c59a0b118616203f 100644 (file)
@@ -1,7 +1,7 @@
-From 0681be50ad65469131c1da1382ac023ca531c392 Mon Sep 17 00:00:00 2001
+From 9248c5368ccd0e1fad575c65582e4a6bd68ac5aa 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/44] Expose external qs tile tint color
+Subject: [PATCH 35/45] Expose external qs tile tint color
 
 This should allow themers to get around issues like this (see pic below)
 
@@ -14,7 +14,7 @@ Change-Id: If6dbf9ab29f8007d85a3c45524b1cf4ba1b032fb
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index 83b8524..e31d124 100644
+index 83b852416e1..e31d1244ac8 100644
 --- a/packages/SystemUI/res/values/projekt_colors.xml
 +++ b/packages/SystemUI/res/values/projekt_colors.xml
 @@ -30,4 +30,6 @@
@@ -25,7 +25,7 @@ index 83b8524..e31d124 100644
 +    <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 {
@@ -38,5 +38,5 @@ index 0cd6490..6fabc61 100644
                  addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext);
              }
 -- 
-2.9.3
+2.11.1
 
index 74210038893d463cee9d06cb193aebf8ad5a95d5..e6703766fdebd28e240c04bbf98d29d804ee62ab 100644 (file)
@@ -1,7 +1,7 @@
-From 7681b7b8ad224b947c65274af013e039edb5dc0a Mon Sep 17 00:00:00 2001
+From 54b140d68403ccf2d7c6055a8ee83021b00b8941 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/44] graphics: ADB "N" icon compatible with OMS7
+Subject: [PATCH 36/45] graphics: ADB "N" icon compatible with OMS7
 
 It's the same problem as the booleans again. This time, it affected the adb "N" icon in the statusbar.
 This commit should fix this.
@@ -28,7 +28,7 @@ Change-Id: Ibab2ce1571360a9e03043d1bf3144c89e54e1947
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
-index 2b950d3..fb26bee 100644
+index 2b950d3d5c5..fb26bee68fa 100644
 --- a/graphics/java/android/graphics/drawable/Icon.java
 +++ b/graphics/java/android/graphics/drawable/Icon.java
 @@ -294,7 +294,7 @@ public final class Icon implements Parcelable {
@@ -41,5 +41,5 @@ index 2b950d3..fb26bee 100644
                          final PackageManager pm = context.getPackageManager();
                          try {
 -- 
-2.9.3
+2.11.1
 
index 7f8417f059cb3e76338df0e00134ee86dbff690f..7d9a5c4255e9fdad77ff4760908c79bd1984f6d0 100644 (file)
@@ -1,7 +1,7 @@
-From c811f30de1b47ef4e5675d526b2ee328dd1dc55d Mon Sep 17 00:00:00 2001
+From 02fa0447251f8893e3d0e788a8c908f2412754d4 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/44] Set external QS tiles tint mode to SRC_ATOP
+Subject: [PATCH 37/45] Set external QS tiles tint mode to SRC_ATOP
 
 While the external qs tile tint color was exposed, we had the same problem
 we had with the external icons in Settings which is if a themer set the color
@@ -19,7 +19,7 @@ Change-Id: I6d577573dd494d61a3e87abebd919b02a481db56
  1 file changed, 2 insertions(+)
 
 diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
-index 6fabc61..dbdb614 100644
+index 6fabc6101ca..dbdb614c8e1 100644
 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
 +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
 @@ -23,6 +23,7 @@ import android.content.Context;
@@ -39,5 +39,5 @@ index 6fabc61..dbdb614 100644
                  addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext);
              }
 -- 
-2.9.3
+2.11.1
 
index e81d4aebeb17ed50931a9f7075a4b0b03a383e02..0329ef05e4519b290abf3603f3336cd2260cc649 100644 (file)
@@ -1,7 +1,7 @@
-From 7b49025a167342f122f5c0a20b88a12073946929 Mon Sep 17 00:00:00 2001
+From 1616425f04bb64f6f4ea04bb357cba684c088897 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/44] Themes: Expose Keyguard affordance circle background
+Subject: [PATCH 38/45] Themes: Expose Keyguard affordance circle background
 
 Change-Id: Id4a078cdbc944fa0c0736103045a0382d49ecb80
 ---
@@ -10,7 +10,7 @@ Change-Id: Id4a078cdbc944fa0c0736103045a0382d49ecb80
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index e31d124..e8f8e50 100644
+index e31d1244ac8..e8f8e502845 100644
 --- a/packages/SystemUI/res/values/projekt_colors.xml
 +++ b/packages/SystemUI/res/values/projekt_colors.xml
 @@ -32,4 +32,6 @@
@@ -21,7 +21,7 @@ index e31d124..e8f8e50 100644
 +    <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
@@ -34,5 +34,5 @@ index b94df1d..3d661b7 100644
  
          mNormalColor = 0xffffffff;
 -- 
-2.9.3
+2.11.1
 
index 403ee620900baa9511290b896a1764faf81b8a1a..d20a80385e0a0b0819521e52877ed587c324e752 100644 (file)
@@ -1,7 +1,7 @@
-From 1111f1d28dabdebbf5359c1656e397c43f5dd9f1 Mon Sep 17 00:00:00 2001
+From 7762d5adeeac6222094c0d809687255bee399318 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <spiritcroc@gmail.com>
 Date: Sun, 5 Feb 2017 12:00:54 +0100
-Subject: [PATCH 39/44] Notification tint: add optional findContrastColor
+Subject: [PATCH 39/45] Notification tint: add optional findContrastColor
  algorithm for dark backgrounds
 
 Overlay config_useDarkBgNotificationIconTextTinting to enable dark bg tinting
@@ -14,7 +14,7 @@ Change-Id: I80cb01caf185c8fcd012ba409eacfa91e887c511
  3 files changed, 68 insertions(+), 2 deletions(-)
 
 diff --git a/core/java/com/android/internal/util/NotificationColorUtil.java b/core/java/com/android/internal/util/NotificationColorUtil.java
-index 4748e6f..bbc9a24 100644
+index 4748e6fb19f..bbc9a24b1ed 100644
 --- a/core/java/com/android/internal/util/NotificationColorUtil.java
 +++ b/core/java/com/android/internal/util/NotificationColorUtil.java
 @@ -37,6 +37,8 @@ import android.text.style.TextAppearanceSpan;
@@ -117,7 +117,7 @@ index 4748e6f..bbc9a24 100644
          if (color != resolvedColor) {
              if (DEBUG){
 diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml
-index 5234959..8cf5666 100644
+index 5234959fc9e..8cf5666a7e4 100644
 --- a/core/res/res/values/projekt_config.xml
 +++ b/core/res/res/values/projekt_config.xml
 @@ -27,4 +27,8 @@
@@ -130,7 +130,7 @@ index 5234959..8cf5666 100644
 +
  </resources>
 diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml
-index 16a5728..faa71e0 100644
+index 16a5728e6c9..faa71e064e6 100644
 --- a/core/res/res/values/projekt_symbols.xml
 +++ b/core/res/res/values/projekt_symbols.xml
 @@ -19,6 +19,7 @@
@@ -142,5 +142,5 @@ index 16a5728..faa71e0 100644
    <java-symbol type="color" name="sender_text_color" />
  
 -- 
-2.9.3
+2.11.1
 
index d9409c1230bdb3d3447909f0364f18c19e86d7f6..3814f05565e76c02f47105f2998c4e631c335d13 100644 (file)
@@ -1,7 +1,7 @@
-From 9d944857f968243c8766ccd7d04dbe9ffdd6a8aa Mon Sep 17 00:00:00 2001
+From c501b8510b255c4f4f9deb18bb539778bae1d64f Mon Sep 17 00:00:00 2001
 From: bigrushdog <randall.rushing@gmail.com>
 Date: Sat, 14 Jan 2017 23:33:38 -0800
-Subject: [PATCH 40/44] Add a protected broadcast for Masquerade events
+Subject: [PATCH 40/45] Add a protected broadcast for Masquerade events
 
 Parse extras to get event details. Docs will be available
 in Masquerade source code
@@ -13,7 +13,7 @@ Change-Id: I24ca3d11438bb830ce97af8b0e935c0700b394e6
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 36df6ea..768b04c 100644
+index 36df6eac13e..768b04c86c5 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -517,6 +517,8 @@
@@ -26,7 +26,7 @@ index 36df6ea..768b04c 100644
      <!--                          RUNTIME PERMISSIONS                           -->
      <!-- ====================================================================== -->
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index faaff1f..79032a9 100644
+index faaff1f08a2..79032a915ca 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
 @@ -4568,7 +4568,8 @@ public class PackageManagerService extends IPackageManager.Stub {
@@ -40,5 +40,5 @@ index faaff1f..79032a9 100644
                  }
              }
 -- 
-2.9.3
+2.11.1
 
index 48b1538c1dc14f45d423dc5204bff1bb4ed0f45d..67dacc7fdd52e8f8474fac5601f99b512c47dab2 100644 (file)
@@ -1,7 +1,7 @@
-From 3d4deeba261756fa40b95f6056e5c514400d446e Mon Sep 17 00:00:00 2001
+From 758de6250d244b94f55be82387cb7b65e7bf91b7 Mon Sep 17 00:00:00 2001
 From: Evan Anderson <evananderson@aospa.co>
 Date: Mon, 27 Feb 2017 15:16:18 -0500
-Subject: [PATCH 41/44] OMS: Add hide annotation to MODIFY_OVERLAYS permission
+Subject: [PATCH 41/45] OMS: Add hide annotation to MODIFY_OVERLAYS permission
 
 * Modifications in this file affect the public API, so we must hide our
   additions to build in release mode
@@ -13,7 +13,7 @@ Signed-off-by: Evan Anderson <evananderson@aospa.co>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 768b04c..e4eeedf 100644
+index 768b04c86c5..e4eeedf93f0 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -3164,7 +3164,8 @@
@@ -27,5 +27,5 @@ index 768b04c..e4eeedf 100644
          android:label="@string/permlab_modifyOverlays"
          android:description="@string/permdesc_modifyOverlays"
 -- 
-2.9.3
+2.11.1
 
index bec4ae587162b64d1392733b33ce571e127456cb..54e22f38931feea8e7bb991e13a4c30ec46617fe 100644 (file)
@@ -1,7 +1,7 @@
-From 17726643d79eb0c48bfb78eb03e0725dd0951af1 Mon Sep 17 00:00:00 2001
+From be5cdb06e90496602deb8c3b62a04acf175b8eb4 Mon Sep 17 00:00:00 2001
 From: Bryan Owens <djbryan3540@gmail.com>
 Date: Mon, 27 Feb 2017 19:06:31 -0600
-Subject: [PATCH 42/44] FWB: Give power dialogs own set of volume icons for
+Subject: [PATCH 42/45] FWB: Give power dialogs own set of volume icons for
  themes
 
 Change-Id: I5add336c06a83b162dfd0832dfabfb06a2827421
@@ -18,7 +18,7 @@ Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
 
 diff --git a/core/res/res/drawable/ic_power_audio_ring_notif.xml b/core/res/res/drawable/ic_power_audio_ring_notif.xml
 new file mode 100644
-index 0000000..6b2dcc4
+index 00000000000..6b2dcc4a675
 --- /dev/null
 +++ b/core/res/res/drawable/ic_power_audio_ring_notif.xml
 @@ -0,0 +1,20 @@
@@ -44,7 +44,7 @@ index 0000000..6b2dcc4
 +</selector>
 diff --git a/core/res/res/drawable/ic_power_audio_ring_notif_mute.xml b/core/res/res/drawable/ic_power_audio_ring_notif_mute.xml
 new file mode 100644
-index 0000000..dab250c
+index 00000000000..dab250cc2d8
 --- /dev/null
 +++ b/core/res/res/drawable/ic_power_audio_ring_notif_mute.xml
 @@ -0,0 +1,20 @@
@@ -70,7 +70,7 @@ index 0000000..dab250c
 +</selector>
 diff --git a/core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml b/core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml
 new file mode 100644
-index 0000000..f278ccb
+index 00000000000..f278ccbf980
 --- /dev/null
 +++ b/core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml
 @@ -0,0 +1,20 @@
@@ -95,7 +95,7 @@ index 0000000..f278ccb
 +    <item android:drawable="@drawable/ic_audio_ring_notif_vibrate" />
 +</selector>
 diff --git a/core/res/res/layout/global_actions_silent_mode.xml b/core/res/res/layout/global_actions_silent_mode.xml
-index a358623..3fe7bbe 100644
+index a3586232a15..3fe7bbec960 100644
 --- a/core/res/res/layout/global_actions_silent_mode.xml
 +++ b/core/res/res/layout/global_actions_silent_mode.xml
 @@ -37,7 +37,7 @@
@@ -126,5 +126,5 @@ index a358623..3fe7bbe 100644
              android:duplicateParentState="true"
              android:background="@drawable/silent_mode_indicator"
 -- 
-2.9.3
+2.11.1
 
index a22537bc9097fc21194c3b1da8e56e2f1973d013..892cd3bf21f758dd74b56a4e69ec89f34a04ba41 100644 (file)
@@ -1,7 +1,7 @@
-From 7eac9d03405f62fab88d54b448c177a2f114149c Mon Sep 17 00:00:00 2001
+From 21e5d69b15cf6467092228653c142deb2987718a Mon Sep 17 00:00:00 2001
 From: George G <kreach3r@users.noreply.github.com>
 Date: Sat, 25 Feb 2017 17:32:18 +0200
-Subject: [PATCH 43/44] base: Force authorize all calling packages by
+Subject: [PATCH 43/45] base: Force authorize all calling packages by
  Masquerade (2/3)
 
 Change-Id: Iaf354c4d891acf9f5e19767223e4f9860a07338f
@@ -10,7 +10,7 @@ Change-Id: Iaf354c4d891acf9f5e19767223e4f9860a07338f
  1 file changed, 6 insertions(+)
 
 diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
-index 7fe6034..4d3e6c9 100644
+index 7fe6034dfe0..4d3e6c9ec08 100644
 --- a/core/java/android/provider/Settings.java
 +++ b/core/java/android/provider/Settings.java
 @@ -6572,6 +6572,12 @@ public final class Settings {
@@ -27,5 +27,5 @@ index 7fe6034..4d3e6c9 100644
           *
           * NOTE: Settings are backed up and restored in the order they appear
 -- 
-2.9.3
+2.11.1
 
index e10c96697ce8ed1b7181a5620892288b6a7e459a..d4c5311fad4c73ad854f9579f2454b86224699b6 100644 (file)
@@ -1,7 +1,7 @@
-From fe50bb1ff1c0f13805f04fe85e5245b54aa5d5b2 Mon Sep 17 00:00:00 2001
+From 4c1e0875511f971804d92fe58c7046dc357380d0 Mon Sep 17 00:00:00 2001
 From: Nathan Chancellor <natechancellor@gmail.com>
 Date: Sat, 4 Mar 2017 00:35:08 +0100
-Subject: [PATCH 44/44] Revert "Add a protected broadcast for Masquerade
+Subject: [PATCH 44/45] Revert "Add a protected broadcast for Masquerade
  events"
 
 Requires https://substratum.review/#/c/374
@@ -15,7 +15,7 @@ Change-Id: Ida416c3949379a3d6a24a104667c74eef1f56630
  2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index e4eeedf..eddbc1d 100644
+index e4eeedf93f0..eddbc1d19a9 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
 @@ -517,7 +517,6 @@
@@ -27,7 +27,7 @@ index e4eeedf..eddbc1d 100644
      <!-- ====================================================================== -->
      <!--                          RUNTIME PERMISSIONS                           -->
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 79032a9..faaff1f 100644
+index 79032a915ca..faaff1f08a2 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
 @@ -4568,8 +4568,7 @@ public class PackageManagerService extends IPackageManager.Stub {
@@ -41,5 +41,5 @@ index 79032a9..faaff1f 100644
                  }
              }
 -- 
-2.9.3
+2.11.1
 
diff --git a/patches/frameworks/base/0045-ThemeSafety-Introduce-App-Crash-Intent.patch b/patches/frameworks/base/0045-ThemeSafety-Introduce-App-Crash-Intent.patch
new file mode 100644 (file)
index 0000000..796da1d
--- /dev/null
@@ -0,0 +1,35 @@
+From 17c4131f89992453b741130a0f6baec1280b622c Mon Sep 17 00:00:00 2001
+From: Ivan Iskandar <iiiiskandar14@gmail.com>
+Date: Thu, 9 Mar 2017 13:28:22 +0100
+Subject: [PATCH 45/45] ThemeSafety: Introduce App Crash Intent
+
+The intent received by substratum and it will disable all enabled
+overlays.
+
+Change-Id: Ifabd57c2ea71ca93ecc2959ce09ccde3e91782dd
+---
+ services/core/java/com/android/server/am/AppErrors.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
+index 0e2fa23f95f..1ff1cdc0081 100644
+--- a/services/core/java/com/android/server/am/AppErrors.java
++++ b/services/core/java/com/android/server/am/AppErrors.java
+@@ -365,6 +365,14 @@ class AppErrors {
+             task = data.task;
+             msg.obj = data;
+             mService.mUiHandler.sendMessage(msg);
++
++            // Send broadcast intent to alert Substratum
++            Intent intent = new Intent("projekt.substratum.APP_CRASHED");
++            intent.putExtra("projekt.substratum.EXTRA_PACKAGE_NAME", r.info.packageName);
++            intent.putExtra("projekt.substratum.EXTRA_CRASH_REPEATING", data.repeating);
++            intent.putExtra("projekt.substratum.EXTRA_EXCEPTION_CLASS_NAME",
++                            crashInfo.exceptionClassName);
++            mContext.sendBroadcast(intent);
+         }
+         int res = result.get();
+-- 
+2.11.1
+