summaryrefslogtreecommitdiffstats
path: root/policy/src
Commit message (Collapse)AuthorAgeFilesLines
* Screen pinning: fix derp from mismerge of older screen pin patchPatrick Lower2015-12-051-7440/+0
| | | | Change-Id: I9b7b0781c14ac518ce88c4a8dfe8a88175b36dbb
* Allow screen unpinning on devices without navbarUtkarsh Gupta2015-12-041-0/+7440
| | | | Change-Id: Iedfc08f4d95bbee3c8578c0d2450b90739e63603
* Remove policy/ and merge GlobalActions changes into servicesd34d2015-10-281-1604/+0
| | | | Change-Id: I17117c0a64f5792913cf8a5d74914be97ab87210
* Add Sound Panel to Power Menu (Part 1/2)Italian Quadcore2015-10-271-12/+46
| | | | Change-Id: I5a638b1817b3de82d891935e0071c6e42856c59e
* Themes: Fix GlobalAction BackgroundAndy Mast2015-10-271-0/+1
| | | | Change-Id: Ic9451cbf31ca8671b16ed4eaef53c694a478e052
* The DUT can't screen shot in guest modelongyu.huang2015-10-261-1/+2
| | | | | Change-Id: I90c95432cba8364ca5a74b6a7b219435291f0769 (cherry picked from commit e64f75193b22167ec95af3980ab6de0d62c4ba51)
* GlobalActions: Use circular user avatarsMichael Bestas2015-10-261-9/+62
| | | | | | | * Use circular & smaller avatars, logic copied from SystemUI * Improve current user indication (thanks to maxwen) Change-Id: Id0ab6271a5249d873c836f75f62862d0a3633c75
* Themes: Port to CM13 [1/3]Andy Mast2015-10-261-0/+1515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Themes: Aapt port Id: I106d447daf7935bada65e78911d8973ce0ca27ae Themes: Port our additions to idmap Id: I2e47cc23de4e7c0b884cccbd87c7d77079ac6824 Themes: remove legacy theme support from idmap Id: I17dfe35f9985d8cef790b26a8bcda738ea65917c Themes: Forward port changes to Installer.java Id: If64e856773e50f5ed74f2358e0c590abad724689 Themes: Add clean spec for aapt Id: I68f5f63f7e83b99230860dd2d8646e96da484b62 androidfw: Port CM overlay contributions Id: Id7b7f5f35011922c668fcea3a8aec5b42bd28653 androidfw: Port addOverlayPath and removeOverlayPath Id: I279db083af28fd8941f3227f2a7512ff094742c1 androidfw: Port addCommonOverlayPath Id: I12d2fe05a04f6a7e553c330505a475346374b507 androidfw: Port addIconPath Id: Ide3db28cde0c7f93edd9e7ad626ebace8d4105cc androidfw: Allow package ID to be overriden at runtime Id: Ieca3a0ae070a6c0ad0cf2b73b5944d83397d08b9 Aapt: Zip Parsing Test Cases w/ Refactoring Id: I28f9115700e186136432138d228111ebcfbd0480 Themes: Update tests for idmap Id: I3dae5bd376d122eab397863378599ae0ac7c6734 androidfw: Add test case for overriding package id Id: I2668c529e24a55cd6bc8437406fc284b853a75e7 androidfw: Add tests for bags The overlayOverridesStyleAttribute will currently fail since our changes to allow theming styles is not currently implemented. Id: Idfacc4382baf4152c839799a22b6cbe015ef2197 androidfw: Don't consider package ids 0x60 and 0x61 as dynamic Package IDs that are not 0x01 (system) or 0x7f (app) are treated as dynamic references. Overlays are assigned specific package ids that fall within the region of shared libraries. This patch treats them the same as system and app resource packages. Id: Ieecaa889bed50490796351302405a38f77c84f4e Theme Parsing & Info Id: I3583d7e8ca704402e3d8c6e1c7cea1645b91c06f Port ThemeUtils and its dependencies This is pretty much copy/paste from cm-11.0 Id: I406860a259136ccca107b981aca0369851df445e Themes: AndroidManifest and Intent port Id: Ib97e8539301d20d120fd8b49891fdaae8205fe42 ComposedIconInfo Port (w/ stubbed IconPackHelper) IconPackHelper is stubbed out so that PMService can reference it, we'll need to port the Resource stack before porting the implementation. Id: I59b680511de525e1d375a4f3be04347686b5e81b Port PackageManagerService and other dependencies Id: I11629d1e5eee21e01c060bc6c0393aae96034b69 Themes: Add in ThemeService See also: external/selinux. The policy must be added in order for the service to start without a security exception. Change-Id: Ic6f64796b264e430e9706a17a3fd2a35085fd1ca TODO: ThemeService / Keyguard interaction TODO: SystemServer - AppsLaunchFailure Add AppsLaunchFailure Id: I09a3826f89c62cb898866408e807f269616f48fc androidfw: Update bags tests The overlayOverridesStyleAttribute was updated such that it does not check the attribute of the theme before adding the overlay. The bag is cached on the first call and the next call, after the overlay is attached, returns that pre-computed bag so the test would always fail. We now simply check that the attribute matches the one in the overlay, and if so then the test passes. This patch also adds a new test to check that an overlay can reference and access resources that are unique to the overlay. Currently this test fails. Id: I3892df3f0d9443a73eaa11b3d5e97cfe86620a73 androidfw: Add test for referencing overlay styles as parents Id: I4fa3bd447c888e96176955924ebe7ee5c784ab55 androidfw: Allow referencing and retrieving overlay resources This patch allows a theme to reference it's own resources. Overlays get their own group which contains those resources that are not idmapped. Idmapped resources end up in the target's group. Id: Ibc119ddcdb35d44a8afec3c6152bcab2909cda18 androidfw: Fill in missing attributes from overlay style Id: I74051b379b73c728c6a2aa4bc62f3cd268a40b53 Protect windowNoTitle and windowActionBar attributes This patch creates a new method to define "protected" attributes. These are attributes like windowActionBar which should not be modified by a theme. Some apps (eg gmail) use the appcompat library which has its own Actionbar classes. When an app uses its own Actionbar it must not include the default actionbar which is achieved through the windowActionBar attribute. Some themes may try to change these attributes, which can will cause the app to crash. Id: Ie3bb7285eed09f3f13facf9d142ea9eb83796eec Themes: Use SYSTEM_DEFAULT in ThemeService Id: I52794dd98ca2f64aa50046ecdd7f79f27c21dd98 androidfw: Test missing parent attributes are merged in This test checks that an overlaid style contains any attributes that were in the original style but omitted in the overlaid style. Id: I6b496ef2eb0a7ef27b4fafdfda5bdf7ccffad989 androidfw: Add test case for protected attributes For this test to pass a protected attribute, such as windowNoTitle, must be equal to the original and not the value specified in the overlay. Id: Ic03f11214a1fc4139e3c48d7e72694a80f819023 Themes: Attach theme and icon resources from java Id: I9ffa0ce96a4af603b78b32d6b190f9698d3e4b4f Themes: Icons, icons, icons! Let there be icons. Legacy icons and composed icons are included in this patch. Id: I9fedafa270f1c4dc30c9c8ffd4cf619895e688e6 Themes: Retrieve explicitly themed context and resources Id: I4e41c251aee47361b183b60089bf5666540f653e Themes: Add themeChange config change to manifest Id: Ia84c0089a79637906e4f75fa38a56e8ff3b21a2b Themes: Register THEME_SERVICE in ContextImpl Id: I608a0b65c7e2ff0d69bae7bf343916f2b985f4a0 Themes: Remove legacy theme support Id: I25887843d31f705425aa40f9a23482fd2cafaef8 androidfw: correctly index paths in idmap Since we added the mtime values for the target and overlay, the indices are increased by two. Id: Ie0f5474d425945d58a12021cd2739240d2e98c0a androidfw: Fix opening assets from theme resources Id: Iedb51163a62b046cdf7fda1ad1b55cc1ee409047 Themes: Consider overlaid resource as "best fit" Id: Ife8342a49eb9502be52f085f88161b113332e9e6 Themes: Save and restore theme config Id: I3fcd445fb458aa6ed09397c05df6eb66d9be7235 Themes: Let ThemeService process additional themes Id: I45837f26948367d5cc6c520e8c53f9da60bd1fda AAPT: Don't applyVersionForCompatibility on android When compiling themes with aapt, we do not want aapt to call applyVersionForCompatibility as this causes the entries in the resource table to have an incorrect path. Id: Ie2c69533b3659c7b7458d6e4b7bdc84946d1be8e androidfw: Don't consider package id 0x5f as dynamic Package id 0x5f is reserved for common overlay resources and needs to be reserved so that it is not considered a dynamic. Id: Id27b8e0e2231ee8541365274d512e347afcfd05b AAPT: Include resources.arsc in apk Common resources needs the resources.arsc in the resources.apk so that it can be included when processing other overlays. Without it, common resources cannot be referenced. Id: I4aee29f660e4a0aa1909240dc0ca5680f0a2d135 Themes: Add keyguard wallpaper support to theme service Id: Ib8f8acd55ab4d2b6ef06ee0a630dc50c4f870beb Themes: Don't pre-process non .9.png images When creating a resources.apk we do not need to pre-process the normal .png images as those can be referenced directly from the theme's apk. Id: Iaf846a03ead9ecb1e68c040eac6e0ecbfc6e5875 Themes: Adjust offsets for idmap hashes Idmap now has a header so the indices to the hashes need to be incremented by one. Id: If1fb183cc116ef9e3ad6cb4e17b6e44763e9e72a Themes: Use single ThemeInfo instead of an array We only ever used the first index so there is no need to use an array of ThemeInfo(s) Id: I9e2af076bc17396a0c978be3c0d31c41277db3df New converter for Kitkat -> L fonts.xml L introduced a new fonts xml format. Its great, but our themes will keep using hte old format. This provides a converter and test cases. The parser was taken from the chooser and remains mostly unchanged with the exception of a getName() helper method. Id: Ia1d42c9e50eb7b52d2d98fe6dbeee530bef3adc2 Themes: Port theme bootanimation support to CM12 Id: Ie016884b0e3b77e08732308923ac44e0975e0116 Resources: Clear drawable cache Id: I04b5b78cce703194a2baeff9c51d2e4733b8ccc9 Font switching Id: Ia43060a7db624102cdcd9b0d9dc7148441401584 Zygote changes Id: Ie3681cf0d2b9929661cf1214e899cef9a5f37471 Recreate String Blocks Id: I4747ebd1a0908b76ae7214b0584948353d426fc5 add a getter for the x and y offsets of the wallpaper window Id: I35294bcac664e85cc5d344b50b5c4335a60d3f37 Themes: Don't spam logcat with CREATING STRING CACHE When processing resources with AAPT on the device, it spams the logcat with warning messages about CREATING STRING CACHE. Change ALOGW to ALOGV so it will only show when verbose logging is enabled. Id: I5b591c3336e176dd71cebe672d60721c29651b00 SystemUI: Audio Volume Panel Id: I78c471864af401b274597339b8451e65931fdb32 AmService uiContext port Id: Ida251d7f80797b0ec78b3d20cf60a795d6c4c1f0 Cleanly detach theme assets Types from an overlay are added to the target group's TypeList and need to be removed when the overlay assets are detached. Failing to remove these types results in resources not being retieved due to the erroneous types. Id: I4a9c624e30309e61fce905ced45c55acd3ac4845 Themes: GlobalAction Port Id: Ifd87e04f94a284e77f1c48bec9fd75d69c45c47e Themes: Do not store forward locked themes in ASEC containers If a theme is in a asec container and is applied, when the device is rebooted the device will get stuck in a nasty boot loop since the theme resources must be read and the asec container is not ready yet. Id: I1d93d8175d5c40b34c222974960c43352012a5ad Use systemui's applied theme for notifications. Notifications contain RemoteViews which are inflated using the application's context for which this notification belongs to. This can look out of place if SystemUI is using a different theme than the rest of the system. This patch will use SystemUIs theme when inflating the RemoteViews, giving us a more consistent look in the notification drawer. Id: I9514ce7fcc4858bad3d3c4190f55c1f5a1441d7c SysUI: Add theme support This ports over the changes needed to facilitate a theme change in SystemUI. Id: I673fb79db90994371a9c0627746a97414132f0ba Themes: Allow composing of VectorDrawable Base icons can be vector drawables. This patch allows them to be composed. Currently, VectorDrawables cannot have filters applied since they do not have a method to get the Paint object like BitmapDrawable and PaintDrawable. Id: I762c8e1f4d1c945b8ebc164bbd7944120324bd42 Themes: Add target api to ThemesContract This will allow the ThemesProvider to track the api a theme was built for. We may want to let the user know when a theme may not be designed for the version of CM installed on their device. Id: Idf0e6cef0ce9ac5e221ce5ff7e0b155ae0258d5f Access Themed ResTables from compiled theme apk [1/2] Before this patch the ResTable for a theme/app was created and accessed seperate from the compiled APK. Since the compiled APK has its own copy of the resources.arsc, we can just reuse the table in the APK instead. Id: I106a2434e74784bc04014831098f49fe128bc7e2 Themes: Port AppsLaunchFailureReceiver to CM12 Id: I5c3265e64aef1536ba5fceed0ec89082e786b686 Themes: Bump idmap hash version to 3 Due to changes in idmap, we need to force the recreation of resource cache when upgrading from CM11 to CM12. Id: I25c1e2c598bca889818e2d685651e3214c30ab3c Remove debug logs Id: Ia5cfa83ddf6da195e20526a94ba154864b8d0ecb Send target sdk version to aapt [1/2] If vector drawables are used in a theme we must have a minSdkVersion of 21 passed to aapt or else aapt will Segfault. Id: I687ee146f9f80543bbcdd06d93891cb3b23001c4 Add missing imports to ActivityThread Id: I09fe07807ed824ccb938e0e174b06653c613c403 Themes: Dynamically add/remove content from StatusBarWindow StatusBarWindowView has logic for resizing and fading content which doesn't always behave correctly if this view is not the root. Rather than create a container, this patch uses the existing StatusBarWindowView as the container and the inflated status bar is then added to this view. Id: Ia93d25a589419145f95d75b1b56eb3c2f300f935 Themes: don't use preloaded drawables when themed If we have themed assets we should try and load those rather than pulling from the preloaded drawables. This allows us to continue and preload drawables in ZygoteInit while maintaining the ability to theme those preloaded assets. Id: I68cfc099d328ece0791b6d0e5cf11d07097fd1fd CM11 -> CM12 Upgrade [1/3] - Introduce a new secure setting "THEME_PREV_BOOT_API_LEVEL". This field will always be set to the previous api level for themes. So if we upgrade from CM11 to CM12 this value will differ from the current API causing an upgrade to trigger - When moving from CM11 -> CM12, unapply incompatible overlays - Rename "holo" to "system" in secure settings themeConfig - Provide a testing downgrade script to put the secure settings db into a state similiar to CM11 (at least for themes) Id: I71be2c0ad83e60ffe8c574f913e5eaecb9700045 Themes: Add constant for system target API Id: I0a6caf65c9e8b0feeef1ae848ba4683235304e8c Change-Id: Ide6d4e1daf535a54efb1ec7cf39ef8b2fb8cf272
* Fix build.Filip Gruszczynski2015-02-251-203/+0
| | | | Change-Id: I76c4a2755e2ae4bf9d59f854a2adb7fd4ef0ffab
* am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-devFilip Gruszczynski2015-02-251-0/+203
|\ | | | | | | | | * commit '0fbcc7086fe742e641915ed5f097119d01613cb5': Burn in protection.
| * am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-devFilip Gruszczynski2015-02-252-0/+211
| |\ | | | | | | | | | | | | * commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178': Burn in protection.
| | * Burn in protection.Filip Gruszczynski2015-02-252-0/+211
| | | | | | | | | | | | | | | Bug: 19373758 Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
| * | am 01dd0e86: Merge "Force translucency from windowIsTranslucent on ↵Filip Gruszczynski2015-02-251-6/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | SwipeDismissLayout." into lmp-mr1-modular-dev * commit '01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719': Force translucency from windowIsTranslucent on SwipeDismissLayout.
| | * Force translucency from windowIsTranslucent on SwipeDismissLayout.Filip Gruszczynski2015-02-241-6/+0
| | | | | | | | | | | | | | | | | | Bug: 18799741 Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
| * | am 7131a7d6: am d245ad24: am 024fd0c6: Disable color view animations when ↵Adrian Roos2015-02-171-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | stable insets change * commit '7131a7d64eab99bacf3e3caaa6494d31812b4162': Disable color view animations when stable insets change
| | * am d245ad24: am 024fd0c6: Disable color view animations when stable insets ↵Adrian Roos2015-02-171-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | change * commit 'd245ad24f5e6e8c7b302689467b12718c94f4ced': Disable color view animations when stable insets change
| | | * am 024fd0c6: Disable color view animations when stable insets changeAdrian Roos2015-02-171-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '024fd0c6051e01579018fad0c1a56e9e47b195df': Disable color view animations when stable insets change
| | | | * Disable color view animations when stable insets changeAdrian Roos2015-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents color view from showing up on phones when the orientation changes to landscape. Previously, the animation was only prevented when the stable inset of a bar became nonzero; now we disable animations whenever the nonzeroness changes. Bug: 19353466 Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
* | | | | Split up android.policy into framework.jar and services.jar 1/3Jorim Jaggi2015-02-1022-16493/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
* | | | | Move AudioService to services.John Spurlock2015-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and a few dependencies. Move remaining shared items to AudioSystem. Change-Id: Ib9623ff867678d34977337856bb0156e8cdaeeb5
* | | | | Merge "Delay unmuting on volume down"RoboErik2015-02-091-7/+14
|\ \ \ \ \
| * | | | | Delay unmuting on volume downRoboErik2015-02-091-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the user to turn the volume down before a stream is unmuted by delaying the unmute call while volume down requests are still being made. bug:19297183 Change-Id: I65a8e489eb4cbfeace4f539103ee0025584102da
* | | | | | am 1d97aa4d: Merge "Allow single press of physical button to go home without ↵Bryce Lee2015-02-071-5/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sleeping." into lmp-mr1-modular-dev automerge: d1444b6 * commit 'd1444b63a173ce21f8588e09fd17f3cc83528c24': Allow single press of physical button to go home without sleeping.
| * | | | | am 1d97aa4d: Merge "Allow single press of physical button to go home without ↵Bryce Lee2015-02-071-5/+21
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | sleeping." into lmp-mr1-modular-dev * commit '1d97aa4d209d7019402a2925c2ca7eb2e36901c7': Allow single press of physical button to go home without sleeping.
| | * | | | Merge "Allow single press of physical button to go home without sleeping." ↵Bryce Lee2015-02-071-5/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-modular-dev
| | | * | | | Allow single press of physical button to go home without sleeping.Bryce Lee2015-02-051-5/+21
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Bug: 18921423 Change-Id: Ic7ee7daeaf1b4e08a7c53451615736ee7a08fb61
* | | | | | am a7404dbd: Merge "Add voice assist action for global actions." into ↵Bryce Lee2015-02-061-0/+25
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev automerge: 35dd319 * commit '35dd319e4a652518ab8b89012e5a8cf73a82090d': Add voice assist action for global actions.
| * | | | am a7404dbd: Merge "Add voice assist action for global actions." into ↵Bryce Lee2015-02-061-0/+25
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'a7404dbde991d36353440546ff8c92e44d218dfe': Add voice assist action for global actions.
| | * | | Add voice assist action for global actions.Bryce Lee2015-02-051-0/+25
| | |/ / | | | | | | | | | | | | | | | | Bug: 18919886 Change-Id: Idd74cf6980207deabfb312732a0316a2edf3c176
* | | | Add API for light status barAdrian Roos2015-02-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a systemUiVisibility flag and links it to the status bar icon controller. Also adds a theme attribute for setting the flag. Bug: 19233606 Change-Id: I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d
* | | | am cd1b1ee3: Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge: ↵Craig Mautner2015-02-031-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 84533ed automerge: 11c6f8b * commit 'cd1b1ee39fbeaf7d95089c183b549b0853206ffd': Remove fall through for KEYCODE_VOICE_ASSIST
| * | | Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge: 84533edCraig Mautner2015-02-031-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 11c6f8b * commit '11c6f8b7c3cc51a3a44bca5003ac3fb56a410c33': Remove fall through for KEYCODE_VOICE_ASSIST
| | * | | Remove fall through for KEYCODE_VOICE_ASSISTHenrik Baard2015-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing unintentional fallthrough for the case KEYCODE_VOICE_ASSIST. The code works today since KEYCODE_VOICE_ASSIST is the last case in the switch statement, however it is bad practice. If somone adds another case statement the code will break. Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
* | | | | Route volume keys directly to the audio system on TVsRoboErik2015-01-291-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This routes volume and mute keys directly to the audio system when on a television instead of letting apps or sessions intercept them. Change-Id: I2af47e30c7842aca96d045a6cc9ca025b94e546a
* | | | | am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" ↵Jose Lima2015-01-281-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 1f81973 automerge: 485f6a6 * commit '485f6a60e0182767d57a5ab08d6438124a69439e': Fix crash caused by disabling the Options panel on TVs
| * | | | am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" ↵Jose Lima2015-01-281-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 1f81973 * commit '4a40f7cc90d8f908527d2cfff32376ee51259250': Fix crash caused by disabling the Options panel on TVs
| | * | | Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-devJose Lima2015-01-281-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | automerge: 1f81973 * commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030': Fix crash caused by disabling the Options panel on TVs
| | | * | Fix crash caused by disabling the Options panel on TVsJose Lima2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address more cases where calls to getPanelState may cause a crash when the options panel is disabled on a platform. Bug: 19178531 Bug: 18780696 Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
* | | | | Merge "Remove TYPE_UNIVERSE_BACKGROUND from system"Craig Mautner2015-01-281-11/+1
|\ \ \ \ \
| * | | | | Remove TYPE_UNIVERSE_BACKGROUND from systemCraig Mautner2015-01-271-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An experiment that is over and has been occupying space. Fixes bug 18088522 item #7 Change-Id: Ib0fcaa24243ed9b0581143e1d5114c1fd2b0aa6e
* | | | | | am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature ↵Jose Lima2015-01-271-15/+24
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | for TVs" into lmp-mr1-dev automerge: 69fbcf1 * commit '69fbcf1f100905f5a28909d561db4753189bd717': Allow disabling the Options Pannel feature for TVs
| * | | | am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature ↵Jose Lima2015-01-271-15/+24
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | for TVs" into lmp-mr1-dev * commit '445768bddf00256195a46b78ed35ea3722df7c92': Allow disabling the Options Pannel feature for TVs
| | * | | am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into ↵Jose Lima2015-01-271-15/+24
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad': Allow disabling the Options Pannel feature for TVs
| | | * | Allow disabling the Options Pannel feature for TVsJose Lima2015-01-261-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a config entry in velues-television to disable the options panel feature for TVs. - Fixed parts of the code in PhoneWindow that assumed this feature is supposed to always be available, which was causing exceptions when it was turned off. Bug: 18780696 Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
* | | | | am 4ecb5fb2: am 82bdfcfa: Update docs for Window.setElevation(), apply ↵Alan Viverette2015-01-131-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | changes immediately automerge: 71922de * commit '4ecb5fb288fd9994e7b2ec0091fbbcdc81f69526': Update docs for Window.setElevation(), apply changes immediately
| * | | | am 82bdfcfa: Update docs for Window.setElevation(), apply changes ↵Alan Viverette2015-01-131-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | immediately automerge: 71922de * commit '82bdfcfadc17b8467a0e3c50843997e7957a9452': Update docs for Window.setElevation(), apply changes immediately
| | * | | Update docs for Window.setElevation(), apply changes immediatelyAlan Viverette2015-01-131-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 71922de * commit '71922de6c8e407ff24bb1a500cb53bb1a647c758': Update docs for Window.setElevation(), apply changes immediately
| | | * | Update docs for Window.setElevation(), apply changes immediatelyAlan Viverette2015-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18983689 Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
* | | | | am 00c85656: am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with ↵Wale Ogunwale2015-01-131-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | invalid types to be added." into lmp-mr1-dev * commit '00c8565614d3555e723ff3d8dad3af92d69d81ea': Don't allow windows with invalid types to be added.
| * | | | am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to ↵Wale Ogunwale2015-01-121-2/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | be added." into lmp-mr1-dev * commit '42b0d10a83dae285a3d3af9911aa35a90db203d0': Don't allow windows with invalid types to be added.