{"push_id":548989536,"size":1,"distinct_size":1,"ref":"refs/heads/lollipop","head":"54aa2df3d6c434432c1844063da28e6cbde7d13e","before":"6572a394cb0009ffaac217089662aa233b761d92","commits":[{"sha":"54aa2df3d6c434432c1844063da28e6cbde7d13e","author":{"email":"918daca015071fe6a23859cfcbbc50b6afcae05a@codeaurora.org","name":"yingying"},"message":"base: Fix the problems for runtime overlay.\n\n - There is no need to make the string blocking when adding the asset path,\n   as it will be made by the resources.\n - After adding the overlay path, it also needs to update the string blocks.\n - Scan all the sub folders for framework overlay res.\n\nChange-Id: Iaad019111ae364c319e58dce57dbf4647b38d4c3\n\nandroidfw: Init the items which are not present in the idmap as 0xffffffff.\n\nWhen creating the idmap, if the entry is not present in the idmap, need to init\nthe item as 0xffffffff.\n\nChange-Id: Iae4a968599e97b29c8b1e1de6a6c1d2639ba240a\n\nRevert \"Freeing frame map\"\n\nThis reverts commit 0c1eeb3c8ab53954218d3b8f4be08ff21be3e985.\nChange-Id: I535330edb636f9457beed0849147168eaa6ae2ec\nConflicts:\ncmds/bootanimation/BootAnimation.cpp\n\nThemes: Port to CM12 [1/6]\n\nThemes: Aapt port\n\nId: I106d447daf7935bada65e78911d8973ce0ca27ae\n\nThemes: Port our additions to idmap\n\nId: I2e47cc23de4e7c0b884cccbd87c7d77079ac6824\n\nThemes: remove legacy theme support from idmap\n\nId: I17dfe35f9985d8cef790b26a8bcda738ea65917c\n\nThemes: Forward port changes to Installer.java\n\nId: If64e856773e50f5ed74f2358e0c590abad724689\n\nThemes: Add clean spec for aapt\n\nId: I68f5f63f7e83b99230860dd2d8646e96da484b62\n\nandroidfw: Port CM overlay contributions\n\nId: Id7b7f5f35011922c668fcea3a8aec5b42bd28653\n\nandroidfw: Port addOverlayPath and removeOverlayPath\n\nId: I279db083af28fd8941f3227f2a7512ff094742c1\n\nandroidfw: Port addCommonOverlayPath\n\nId: I12d2fe05a04f6a7e553c330505a475346374b507\n\nandroidfw: Port addIconPath\n\nId: Ide3db28cde0c7f93edd9e7ad626ebace8d4105cc\n\nandroidfw: Allow package ID to be overriden at runtime\n\nId: Ieca3a0ae070a6c0ad0cf2b73b5944d83397d08b9\n\nAapt: Zip Parsing Test Cases w/ Refactoring\n\nId: I28f9115700e186136432138d228111ebcfbd0480\n\nThemes: Update tests for idmap\n\nId: I3dae5bd376d122eab397863378599ae0ac7c6734\n\nandroidfw: Add test case for overriding package id\n\nId: I2668c529e24a55cd6bc8437406fc284b853a75e7\n\nandroidfw: Add tests for bags\n\nThe overlayOverridesStyleAttribute will currently fail since\nour changes to allow theming styles is not currently implemented.\n\nId: Idfacc4382baf4152c839799a22b6cbe015ef2197\n\nandroidfw: Don't consider package ids 0x60 and 0x61 as dynamic\n\nPackage IDs that are not 0x01 (system) or 0x7f (app) are treated\nas dynamic references.  Overlays are assigned specific package\nids that fall within the region of shared libraries.  This patch\ntreats them the same as system and app resource packages.\n\nId: Ieecaa889bed50490796351302405a38f77c84f4e\n\nTheme Parsing & Info\n\nId: I3583d7e8ca704402e3d8c6e1c7cea1645b91c06f\n\nPort ThemeUtils and its dependencies\n\nThis is pretty much copy/paste from cm-11.0\n\nId: I406860a259136ccca107b981aca0369851df445e\n\nThemes: AndroidManifest and Intent port\n\nId: Ib97e8539301d20d120fd8b49891fdaae8205fe42\n\nComposedIconInfo Port (w/ stubbed IconPackHelper)\n\nIconPackHelper is stubbed out so that PMService can reference it,\nwe'll need to port the Resource stack before porting the implementation.\n\nId: I59b680511de525e1d375a4f3be04347686b5e81b\n\nPort PackageManagerService and other dependencies\n\nId: I11629d1e5eee21e01c060bc6c0393aae96034b69\n\nThemes: Add in ThemeService\n\nSee also: external/selinux. The policy must be added\nin order for the service to start without a security exception.\n\nChange-Id: Ic6f64796b264e430e9706a17a3fd2a35085fd1ca\nTODO: ThemeService / Keyguard interaction\nTODO: SystemServer - AppsLaunchFailure\n\nAdd AppsLaunchFailure\n\nId: I09a3826f89c62cb898866408e807f269616f48fc\n\nandroidfw: Update bags tests\n\nThe overlayOverridesStyleAttribute was updated such that it does\nnot check the attribute of the theme before adding the overlay.\nThe bag is cached on the first call and the next call, after the\noverlay is attached, returns that pre-computed bag so the test would\nalways fail.  We now simply check that the attribute matches the one\nin the overlay, and if so then the test passes.\n\nThis patch also adds a new test to check that an overlay can reference\nand access resources that are unique to the overlay.  Currently this\ntest fails.\n\nId: I3892df3f0d9443a73eaa11b3d5e97cfe86620a73\n\nandroidfw: Add test for referencing overlay styles as parents\n\nId: I4fa3bd447c888e96176955924ebe7ee5c784ab55\n\nandroidfw: Allow referencing and retrieving overlay resources\n\nThis patch allows a theme to reference it's own resources.  Overlays\nget their own group which contains those resources that are not idmapped.\nIdmapped resources end up in the target's group.\n\nId: Ibc119ddcdb35d44a8afec3c6152bcab2909cda18\n\nandroidfw: Fill in missing attributes from overlay style\n\nId: I74051b379b73c728c6a2aa4bc62f3cd268a40b53\n\nProtect windowNoTitle and windowActionBar attributes\n\nThis patch creates a new method to define \"protected\" attributes. These\nare attributes like windowActionBar which should not be modified by\na theme.\n\nSome apps (eg gmail) use the appcompat library which\nhas its own Actionbar classes. When an app uses its own\nActionbar it must not include the default actionbar which is\nachieved through the windowActionBar attribute.\n\nSome themes may try to change these attributes, which can will cause\nthe app to crash.\n\nId: Ie3bb7285eed09f3f13facf9d142ea9eb83796eec\n\nThemes: Use SYSTEM_DEFAULT in ThemeService\n\nId: I52794dd98ca2f64aa50046ecdd7f79f27c21dd98\n\nandroidfw: Test missing parent attributes are merged in\n\nThis test checks that an overlaid style contains any attributes\nthat were in the original style but omitted in the overlaid style.\n\nId: I6b496ef2eb0a7ef27b4fafdfda5bdf7ccffad989\n\nandroidfw: Add test case for protected attributes\n\nFor this test to pass a protected attribute, such as windowNoTitle,\nmust be equal to the original and not the value specified in the\noverlay.\n\nId: Ic03f11214a1fc4139e3c48d7e72694a80f819023\n\nThemes: Attach theme and icon resources from java\n\nId: I9ffa0ce96a4af603b78b32d6b190f9698d3e4b4f\n\nThemes: Icons, icons, icons!\n\nLet there be icons.  Legacy icons and composed icons are included\nin this patch.\n\nId: I9fedafa270f1c4dc30c9c8ffd4cf619895e688e6\n\nThemes: Retrieve explicitly themed context and resources\n\nId: I4e41c251aee47361b183b60089bf5666540f653e\n\nThemes: Add themeChange config change to manifest\n\nId: Ia84c0089a79637906e4f75fa38a56e8ff3b21a2b\n\nThemes: Register THEME_SERVICE in ContextImpl\n\nId: I608a0b65c7e2ff0d69bae7bf343916f2b985f4a0\n\nThemes: Remove legacy theme support\n\nId: I25887843d31f705425aa40f9a23482fd2cafaef8\n\nandroidfw: correctly index paths in idmap\n\nSince we added the mtime values for the target and overlay, the\nindices are increased by two.\n\nId: Ie0f5474d425945d58a12021cd2739240d2e98c0a\n\nandroidfw: Fix opening assets from theme resources\n\nId: Iedb51163a62b046cdf7fda1ad1b55cc1ee409047\n\nThemes: Consider overlaid resource as \"best fit\"\n\nId: Ife8342a49eb9502be52f085f88161b113332e9e6\n\nThemes: Save and restore theme config\n\nId: I3fcd445fb458aa6ed09397c05df6eb66d9be7235\n\nThemes: Let ThemeService process additional themes\n\nId: I45837f26948367d5cc6c520e8c53f9da60bd1fda\n\nAAPT: Don't applyVersionForCompatibility on android\n\nWhen compiling themes with aapt, we do not want aapt to call\napplyVersionForCompatibility as this causes the entries in the\nresource table to have an incorrect path.\n\nId: Ie2c69533b3659c7b7458d6e4b7bdc84946d1be8e\n\nandroidfw: Don't consider package id 0x5f as dynamic\n\nPackage id 0x5f is reserved for common overlay resources and needs\nto be reserved so that it is not considered a dynamic.\n\nId: Id27b8e0e2231ee8541365274d512e347afcfd05b\n\nAAPT: Include resources.arsc in apk\n\nCommon resources needs the resources.arsc in the resources.apk\nso that it can be included when processing other overlays.  Without\nit, common resources cannot be referenced.\n\nId: I4aee29f660e4a0aa1909240dc0ca5680f0a2d135\n\nThemes: Add keyguard wallpaper support to theme service\n\nId: Ib8f8acd55ab4d2b6ef06ee0a630dc50c4f870beb\n\nThemes: Don't pre-process non .9.png images\n\nWhen creating a resources.apk we do not need to pre-process\nthe normal .png images as those can be referenced directly from\nthe theme's apk.\n\nId: Iaf846a03ead9ecb1e68c040eac6e0ecbfc6e5875\n\nThemes: Adjust offsets for idmap hashes\n\nIdmap now has a header so the indices to the hashes need to be\nincremented by one.\n\nId: If1fb183cc116ef9e3ad6cb4e17b6e44763e9e72a\n\nThemes: Use single ThemeInfo instead of an array\n\nWe only ever used the first index so there is no need to use\nan array of ThemeInfo(s)\n\nId: I9e2af076bc17396a0c978be3c0d31c41277db3df\n\nNew converter for Kitkat -> L fonts.xml\n\nL introduced a new fonts xml format. Its great, but our themes will\nkeep using hte old format. This provides a converter and\ntest cases. The parser was taken from the chooser and remains\nmostly unchanged with the exception of a getName() helper method.\n\nId: Ia1d42c9e50eb7b52d2d98fe6dbeee530bef3adc2\n\nThemes: Port theme bootanimation support to CM12\n\nId: Ie016884b0e3b77e08732308923ac44e0975e0116\n\nResources: Clear drawable cache\n\nId: I04b5b78cce703194a2baeff9c51d2e4733b8ccc9\n\nFont switching\n\nId: Ia43060a7db624102cdcd9b0d9dc7148441401584\n\nZygote changes\n\nId: Ie3681cf0d2b9929661cf1214e899cef9a5f37471\n\nRecreate String Blocks\n\nId: I4747ebd1a0908b76ae7214b0584948353d426fc5\n\nadd a getter for the x and y offsets of the wallpaper window\n\nId: I35294bcac664e85cc5d344b50b5c4335a60d3f37\n\nThemes: Don't spam logcat with CREATING STRING CACHE\n\nWhen processing resources with AAPT on the device, it spams the\nlogcat with warning messages about CREATING STRING CACHE.  Change\nALOGW to ALOGV so it will only show when verbose logging is enabled.\n\nId: I5b591c3336e176dd71cebe672d60721c29651b00\n\nSystemUI: Audio Volume Panel\n\nId: I78c471864af401b274597339b8451e65931fdb32\n\nAmService uiContext port\n\nId: Ida251d7f80797b0ec78b3d20cf60a795d6c4c1f0\n\nCleanly detach theme assets\n\nTypes from an overlay are added to the target group's\nTypeList and need to be removed when the overlay assets\nare detached.  Failing to remove these types results in\nresources not being retieved due to the erroneous types.\n\nId: I4a9c624e30309e61fce905ced45c55acd3ac4845\n\nThemes: GlobalAction Port\n\nId: Ifd87e04f94a284e77f1c48bec9fd75d69c45c47e\n\nThemes: Do not store forward locked themes in ASEC containers\n\nIf a theme is in a asec container and is applied, when the\ndevice is rebooted the device will get stuck in a nasty boot loop since\nthe theme resources must be read and the asec container is not ready yet.\n\nId: I1d93d8175d5c40b34c222974960c43352012a5ad\n\nUse systemui's applied theme for notifications.\n\nNotifications contain RemoteViews which are inflated using the\napplication's context for which this notification belongs to.  This\ncan look out of place if SystemUI is using a different theme than the\nrest of the system.\n\nThis patch will use SystemUIs theme when inflating the RemoteViews,\ngiving us a more consistent look in the notification drawer.\n\nId: I9514ce7fcc4858bad3d3c4190f55c1f5a1441d7c\n\nSysUI: Add theme support\n\nThis ports over the changes needed to facilitate a theme change in\nSystemUI.\n\nId: I673fb79db90994371a9c0627746a97414132f0ba\n\nThemes: Allow composing of VectorDrawable\n\nBase icons can be vector drawables.  This patch allows them to be\ncomposed.  Currently, VectorDrawables cannot have filters applied\nsince they do not have a method to get the Paint object like\nBitmapDrawable and PaintDrawable.\n\nId: I762c8e1f4d1c945b8ebc164bbd7944120324bd42\n\nThemes: Add target api to ThemesContract\n\nThis will allow the ThemesProvider to track the api a theme was\nbuilt for.  We may want to let the user know when a theme may not\nbe designed for the version of CM installed on their device.\n\nId: Idf0e6cef0ce9ac5e221ce5ff7e0b155ae0258d5f\n\nAccess Themed ResTables from compiled theme apk [1/2]\n\nBefore this patch the ResTable for a theme/app was created and\naccessed seperate from the compiled APK. Since the compiled APK\nhas its own copy of the resources.arsc, we can just reuse the table\nin the APK instead.\n\nId: I106a2434e74784bc04014831098f49fe128bc7e2\n\nThemes: Port AppsLaunchFailureReceiver to CM12\n\nId: I5c3265e64aef1536ba5fceed0ec89082e786b686\n\nThemes: Bump idmap hash version to 3\n\nDue to changes in idmap, we need to force the recreation of resource\ncache when upgrading from CM11 to CM12.\n\nId: I25c1e2c598bca889818e2d685651e3214c30ab3c\n\nRemove debug logs\n\nId: Ia5cfa83ddf6da195e20526a94ba154864b8d0ecb\n\nSend target sdk version to aapt [1/2]\n\nIf vector drawables are used in a theme we must have a minSdkVersion of 21 passed\nto aapt or else aapt will Segfault.\n\nId: I687ee146f9f80543bbcdd06d93891cb3b23001c4\n\nAdd missing imports to ActivityThread\n\nId: I09fe07807ed824ccb938e0e174b06653c613c403\n\nThemes: Dynamically add/remove content from StatusBarWindow\n\nStatusBarWindowView has logic for resizing and fading content\nwhich doesn't always behave correctly if this view is not the\nroot.  Rather than create a container, this patch uses the\nexisting StatusBarWindowView as the container and the inflated\nstatus bar is then added to this view.\n\nId: Ia93d25a589419145f95d75b1b56eb3c2f300f935\n\nThemes: don't use preloaded drawables when themed\n\nIf we have themed assets we should try and load those rather than\npulling from the preloaded drawables.  This allows us to continue\nand preload drawables in ZygoteInit while maintaining the ability\nto theme those preloaded assets.\n\nId: I68cfc099d328ece0791b6d0e5cf11d07097fd1fd\n\nCM11 -> CM12 Upgrade [1/3]\n\n- Introduce a new secure setting \"THEME_PREV_BOOT_API_LEVEL\".\n  This field will always be set to the previous api level for themes.\n  So if we upgrade from CM11 to CM12 this value will differ from the current API\n  causing an upgrade to trigger\n\n- When moving from CM11 -> CM12, unapply incompatible overlays\n\n- Rename \"holo\" to \"system\" in secure settings themeConfig\n\n- Provide a testing downgrade script to put the secure settings db into a state\n  similiar to CM11 (at least for themes)\n\nId: I71be2c0ad83e60ffe8c574f913e5eaecb9700045\n\nThemes: Add constant for system target API\n\nId: I0a6caf65c9e8b0feeef1ae848ba4683235304e8c\n\nChange-Id: Ide6d4e1daf535a54efb1ec7cf39ef8b2fb8cf272\n\nConflicts:\n\tcmds/bootanimation/BootAnimation.cpp\n\tcmds/bootanimation/BootAnimation.h\n\tcmds/idmap/scan.cpp\n\tcore/java/android/app/ContextImpl.java\n\tcore/java/android/content/pm/ApplicationInfo.java\n\tcore/java/android/content/pm/IPackageManager.aidl\n\tcore/java/android/content/res/AssetManager.java\n\tcore/java/android/provider/Settings.java\n\tcore/jni/android_util_AssetManager.cpp\n\tcore/res/AndroidManifest.xml\n\tcore/res/res/values/cm_strings.xml\n\tcore/res/res/values/symbols.xml\n\tlibs/androidfw/AssetManager.cpp\n\tlibs/androidfw/ResourceTypes.cpp\n\tpackages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java\n\tpackages/SystemUI/res/layout/msim_super_status_bar.xml\n\tpackages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java\n\tpackages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java\n\tpackages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java\n\tpackages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java\n\tpackages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java\n\tpackages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java\n\tpolicy/src/com/android/internal/policy/impl/GlobalActions.java\n\tservices/core/java/com/android/server/am/ActivityManagerService.java\n\tservices/core/java/com/android/server/pm/PackageManagerService.java\n\tservices/java/com/android/server/SystemServer.java\n\nConflicts:\n\tcmds/idmap/scan.cpp\n\tcore/java/android/content/res/AssetManager.java\n\tcore/jni/android_util_AssetManager.cpp\n\tlibs/androidfw/AssetManager.cpp\n\tlibs/androidfw/ResourceTypes.cpp\n\nCM Theme manager fixes\n\nframeworks: add keyguard wallpaper functionality to WallpaperManager\n\nAdapted for cm-12.\n\nChange-Id: I0eb1b5578b705c2ade4c0772fa86e09478b9f73e\nSigned-off-by: Roman Birg <roman@cyngn.com>\n\nConflicts:\n\tcore/res/res/values/cm_strings.xml\n\nConflicts:\n\tcore/res/res/values/custom_strings.xml\n\nThemes: Hide LegacyFontParser and THEME_PREV_BOOT_API_LEVEL\n\nChange-Id: Ic43367a80dd6583b91fa6e0548af0866a832ac2a\n\nClean host static libaapt\n\nChange-Id: I4b00f171577b85ad02e7e7e398425a46bdfc5466\n\nThemes: Fix GlobalAction Background\n\nChange-Id: Ic9451cbf31ca8671b16ed4eaef53c694a478e052\n\nThemes: Call startKeyguard() when recreating status bar\n\nmStatusBarKeyguardViewManager holds on to a reference of ScrimController\nand we need to update this otherwise the scrim will remain on the screen\nand consume all touch events.\n\nThis is easily reproduced by changing a theme and then turning the screen\noff and on to display the keyguard.  Once the keyguard is dismissed the\nscrim remains on the screen.\n\nChange-Id: Ie050a951117ed4aebef4ea3343366b9b9361b8a6\n\nCM Theme Manager: import SQLiteException\n\nCM Theme Manager: get rid of cm_strings.xml\n\nCM Theme Manager: Statusbar build fixes\n\nImport ActivityOptions again\n\nCM Theme Manager commit removed it lol\n\nThemes: Call startKeyguard() when recreating status bar\n\nmStatusBarKeyguardViewManager holds on to a reference of ScrimController\nand we need to update this otherwise the scrim will remain on the screen\nand consume all touch events.\n\nThis is easily reproduced by changing a theme and then turning the screen\noff and on to display the keyguard.  Once the keyguard is dismissed the\nscrim remains on the screen.\n\nChange-Id: Ie050a951117ed4aebef4ea3343366b9b9361b8a6\n\nCM Theme Manager, remove this\n\nCM Theme Manager: remove even more","distinct":true,"url":"https://api.github.com/repos/Lethargy/android_frameworks_base/commits/54aa2df3d6c434432c1844063da28e6cbde7d13e"}]}