summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* camera: fix samsung/qcom conflictcodeworkx2012-07-081-2/+4
| | | | | | hello ifdef hell Change-Id: I76bede141dfd4fd4f32b5a5aa8987fb255c207a5
* camera: ISO mode support (1/2)athurh2012-07-081-0/+2
| | | | Change-Id: Icdd4f676ea15b933985a9505fcf316aeb7c50ce2
* framework/base: hwui: Clear layer FBO after FBO cache is updatedOmprakash Dhyade2012-07-021-0/+2
| | | | | | | | | | | | | | | Due to bug in GLRenderer stale FBO remains and can cause corruption, clear layer fbo when fbo returned to cache. CRs-fixed: 340481 (cherry picked from commit b01c082e12c4c4091016af1c95d851f29f5b7514) Conflicts: libs/hwui/LayerRenderer.cpp Change-Id: I8624879b4adbf9438a8c065b78932d1a4a2a15d4
* Aligning native Parcel implementation to Java.Magnus Strandberg2012-06-081-1/+2
| | | | | | | | | | | The Java implementation of writing the RPC response header calculates the length of the header including the 4 bytes specifying the header length but the native implementation excludes the 4 bytes specifying the length from the header length. The native implementation has been aligned to the Java impl. Change-Id: I325bf272a63152d8fded4cf4e51a906b5a9bfe19
* Merge "Revert "libhwui: Correct transform used for drawing text-shadow."" ↵Steve Kondik2012-06-031-4/+0
|\ | | | | | | into ics
| * Revert "libhwui: Correct transform used for drawing text-shadow."Giulio Cervera2012-06-011-4/+0
| | | | | | | | This reverts commit 5e30781aba176787e3abc50c79c35fbba6a1deeb.
* | Merge "camera: Add parameters for HTC msm8960" into icsSteve Kondik2012-06-031-0/+17
|\ \
| * | camera: Add parameters for HTC msm8960Ethan Chen2012-05-211-0/+17
| | | | | | | | | | | | | | | | | | | | | Enable with QCOM_HARDWARE. Add MIN_SATURATION, MIN_SHARPNESS, MIN_CONTRAST, CONTI_BURST modes. Change-Id: Ia744e32620629967e1fc17fa4c3c08016bdaa370
* | | SurfaceTextureClient : Reset buffer size to 0 after setting geometrySravan Kumar D.V.N2012-06-011-0/+16
| |/ |/| | | | | | | | | | | | | | | | | Buffer size has to be reset to 0 after setting geometry , otherwise the new request may get the buffer with wrong size. CRs-Fixed: 337041 (cherry picked from commit 9b3ebedad4f53b7348135dac827392a39b01f69f) Change-Id: Id9afe01c80912d3245c2f37ddac51f550c896dce
* | surfacetexture: Add option for choosing texture target on old AdrenosArne Coucheron2012-05-202-1/+16
|/ | | | | | | | | Commit 417d89259effb373c0c3a411b7a7d1f7f75b2eb2 removed a workaround for old Adreno drivers which are not optimized for GL_TEXTURE_EXTERNAL_OES. This causes performance issues for some platforms. Add a compile time option to enable this. Change-Id: I3389c7c4cc997b21d1ddb445262ac184ff37e598
* camera: Add parameters for some Samsung camerasSteve Kondik2012-05-151-0/+5
| | | | | | | * Enable with SAMSUNG_CAMERA_HARDWARE * Adds anti-shake, metering, and wdr modes. Change-Id: I080c90e11fcb8fa48900c01a454868f173f61eb0
* Merge remote-tracking branch 'github/kali' into icsRicardo Cerqueira2012-05-146-61/+30
|\ | | | | | | | | | | | | | | | | Conflicts: libs/gui/SurfaceTextureClient.cpp services/surfaceflinger/Layer.cpp services/surfaceflinger/SurfaceTextureLayer.cpp Change-Id: Ib353e7d86411c0a3ceb5ecdb75c40a7b7842da15
| * frameworks/base: capping live wallpapper fpsRajulu Ponnada2012-05-041-0/+16
| | | | | | | | | | | | | | CRs-Fixed: 343813 (cherry picked from commit a3343a04940bcd31d1a9992336ab178777fd0ff9) Change-Id: I46b805f8cf74995a744eb6c9e0cd0d593d3af3b9
| * SurfaceFlinger: Handle WFD and HDMI concurrency.Arun Kumar K.R2012-05-022-42/+8
| | | | | | | | | | | | | | | | - changes to handle wifi display and HDMI concurrency - rename enableHDMIOutput to enableExternalDisplay - remove action safe related functions(not used anymore) Change-Id: I15feb1309c2964de3deb968c334eb09e742afb6c
| * Revert "SurfaceFlinger: Handle WFD and HDMI concurrency"Giulio Cervera2012-05-022-8/+42
| | | | | | | | This reverts commit 68ac37dc87668d00a0b79f8dc99dea8ad2f18be0.
| * SurfaceTexture: returning the current transform valueKyong Hwa Bae2012-05-021-4/+2
| | | | | | | | Change-Id: I2975057f47b219ef1ebe73cb8ef85048dc22c784
| * Merge remote-tracking branch 'github/ics' into ics_chocolate_M8260AAABQNLZA30150Giulio Cervera2012-05-024-4/+32
| |\
| * | SurfaceFlinger: Return the current transform value when queriedKyong Hwa Bae2012-04-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application queries the transform hint, SurfaceTexture returns the value based on the previous queueBuffer function. When query() is called before any queueBuffer() calls, it doesn't return the current transform. Make sure to get the current transform from a layer whenever query() is called. (cherry picked from commit d9668f53f8c41c16588531183f3ec8d6780b234d) Change-Id: I635481ccd7d22148d2b7ab92f4e8c0c63ef7e715
| * | Revert "Select texture target based on pixel format"Giulio Cervera2012-04-241-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic revert was not possible. Graphics team completed the optimizations for GL_TEXTURE_EXTERNAL, and this change is no longer required in frameworks. Change-Id: I8330d19e686b450d3fb6ca2d96c0615f16c0906b CRs-fixed: 328074, 345078, 344565
| * | libhwui: Correct transform used for drawing text-shadow.Sushil Chauhan2012-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The model-view transform used for text-shadow in drawText() should be in sync with the transform used for main text draw. CRs-Fixed: 342161 Change-Id: I6bb36691c84809aaede65ad5fc1c4a1e90f1ecfc (cherry picked from commit d4c8be8416c6c3064e43ed80ebacb2a177be3019)
| * | SurfaceFlinger: Handle WFD and HDMI concurrencyArun Kumar K.R2012-04-242-42/+8
| | | | | | | | | | | | | | | | | | | | | | | | - changes to handle wifi display and HDMI concurrency - rename enableHDMIOutput to enableExternalDisplay - remove action safe related functions(not used anymore) Change-Id: Ib7d9aa4472a4419c395728fec07f7f9827198bbf
* | | Merge "MemoryHeapBase: ifdef for gingerbread compatibility" into icsSteve Kondik2012-05-133-5/+45
|\ \ \
| * | | MemoryHeapBase: ifdef for gingerbread compatibilityTanguy Pruvot2012-05-023-5/+45
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to "revert" by a board config flag the offset member addon see commit f24c4cd0f20 (aosp change id Ie618fb5c0718e) This change is required to use overlay based proprietary camera libs coming from gingerbread and froyo builds. This change also requires a global cflag named BINDER_COMPAT because a lot of modules use the MemoryHeap includes Add this in your BoardConfig.mk : COMMON_GLOBAL_CFLAGS += -DBINDER_COMPAT Change-Id: Ib0370fbf4c4770f8141607a8fc393639ffbdc8e2
* | | Merge "FontRenderer: do not leak mIndexBufferID" into icsSteve Kondik2012-05-131-0/+4
|\ \ \
| * | | FontRenderer: do not leak mIndexBufferIDJeremy Gebben2012-05-061-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This glBuffer needs to be deleted to avoid leaking graphics memory. CRs-Fixed: 346272 Change-Id: Ib56553fffbf88848905893b02a986765823050ad (cherry picked from commit 8ee3ffb1c0096767311b55c509e1288901f3747f)
* | | Merge "SurfaceTexture: Reset buffer values on disconnect." into icsSteve Kondik2012-05-131-0/+7
|\ \ \
| * | | SurfaceTexture: Reset buffer values on disconnect.Chetan Kalyan2012-05-061-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | When the surface texture client disconnects, reset the values set for buffer width, height, transform and format. This is to ensure that the same surface texture can be used by another client with different parameters without any corruptions. Change-Id: I1e158f4641d7b06cea9976ad2827c7b12c95f538 CRs-Fixed: 347382
* | | Merge "SurfaceFlinger: Return the current transform value when queried" into icsSteve Kondik2012-05-131-0/+6
|\ \ \
| * | | SurfaceFlinger: Return the current transform value when queriedKyong Hwa Bae2012-05-061-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application queries the transform hint, SurfaceTexture returns the value based on the previous queueBuffer function. When query() is called before any queueBuffer() calls, it doesn't return the current transform. Make sure to get the current transform from a layer whenever query() is called. Change-Id: Id86c931dc72285cf754cc6c77219434388fc0d69
* | | Merge remote-tracking branch 'tmo/themes-2.3.1_r1' into themes-4.0Ricardo Cerqueira2012-05-044-73/+447
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adapt to ICS API changes * Remove part of idmap due to conflicts * Restructure statusbar code * Fix issues with PowerWidget on phones to avoid the CM7 hackish restart of SystemUI * Add reinflation to properly redo status icons on tablets Conflicts: core/java/android/app/ActivityManager.java core/java/android/app/ActivityThread.java core/java/android/app/ContextImpl.java core/java/android/content/pm/ApplicationInfo.java core/java/android/content/pm/IPackageManager.aidl core/java/android/content/pm/PackageParser.java core/java/android/content/res/AssetManager.java core/java/android/content/res/CompatibilityInfo.java core/java/android/content/res/Configuration.java core/java/android/content/res/Resources.java core/java/com/android/internal/os/ZygoteInit.java core/jni/AndroidRuntime.cpp core/jni/android_util_AssetManager.cpp core/res/AndroidManifest.xml data/etc/platform.xml include/utils/AssetManager.h include/utils/ResourceTypes.h libs/utils/Android.mk libs/utils/AssetManager.cpp libs/utils/ResourceTypes.cpp media/java/android/media/RingtoneManager.java packages/SystemUI/res/layout/status_bar.xml packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java packages/SystemUI/src/com/android/systemui/statusbar/TrackingView.java policy/src/com/android/internal/policy/impl/PhoneWindowManager.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java services/java/com/android/server/am/ActivityManagerService.java test-runner/src/android/test/mock/MockPackageManager.java Change-Id: Icabcd2c7b07dcbf174789b34f960360b87d7f27a
| * | Fixed cyanogenmod issue 2861: asset redirection breaks access to ↵Josh Guilfoyle2011-03-071-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidManifest.xml. Themed asset managers lose the ability to access application assets without a cookie because the search order favors most recently added asset paths (theme apks are added last). So, searching for AndroidManifest.xml would always return the themes manifest, not the application manifest. The solution is to mark the themed asset path and ignore it when searching for cookie-less assets. This should not cause problems with theme application because the theme uses resource identifier based redirections which always retain the asset path cookie that is to be used to load the final resource.
| * | Removed AssetManager#dumpResources.Josh Guilfoyle2011-02-042-168/+1
| | | | | | | | | | | | | | | | | | | | | This method was used only for debugging and has not been useful for quite a long time. Change-Id: I38f3c60bb6a7400758623ac80faf2350e387d51e
| * | Removed dead theme engine code.Josh Guilfoyle2011-02-041-53/+0
| | | | | | | | | | | | Change-Id: Ib9581787b7f2a305633c17cebe4404b02c01bee5
| * | Corrected whitespace trespasses.Josh Guilfoyle2011-02-041-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Many small whitespace mistakes slipped into the framework as the themes feature was developed. This patch reverts them to make a cleaner patch set against android-2.3.1_r1. Change-Id: I52223c1d572d4f013e37bebc5c11bb7b1c595eb3
| * | Fixed a regression causing theme switch to fail.Josh Guilfoyle2011-01-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This would only occur when switching from one theme APK to another, which apparently was not tested on the experimental branch (??). The bug would not repro if switching between system default and a theme APK. Change-Id: I9fc0b5c50c1dff4a0b2d548980977faaa0a51167
| * | Asset redirections are now managed by a system service.Josh Guilfoyle2011-01-205-731/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted the asset redirection design to use a common system service (AssetRedirectionManagerService) for synchronization and cache management. This replaces the old /data/res-cache design completely (nothing is written to disk now). This change also moves a large amount of code from the C++ layer to Java for parsing the theme meta data and redirection XML files, though the actual redirection still occurs at the native layer. Change-Id: I8820e39425135269f5e723534c4b9c8dc6841779
| * | Fix issues with theme APKs that do not specify a styleId.Josh Guilfoyle2010-12-271-3/+3
| | |
| * | Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1Josh Guilfoyle2010-12-23131-22817/+18642
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/app/ActivityThread.java core/java/android/content/pm/ApplicationInfo.java core/java/android/content/pm/PackageParser.java core/res/AndroidManifest.xml services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java test-runner/src/android/test/mock/MockPackageManager.java
| * | | Pass the high-level theme resource id into the redirection table layer.Josh Guilfoyle2010-12-231-30/+18
| | | | | | | | | | | | | | | | | | | | This is necessary to provide the high-level style redirection heuristics (previously this was hacked to assume the Androidian's theme style id).
| * | | Create res-cache folders world-writable for now.Josh Guilfoyle2010-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This represents a security vulnerability that permits tampering. Should be closed by centralizing write access to this directory to a special system service.
| * | | Switched FileLock to use fcntl for compatability with the Java layer.Josh Guilfoyle2010-12-221-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Java layer (i.e. Harmony) is currently implementing FileLock this way so we are aligning to be compatable with locks created from FileChannel#lock. This code is therefore fragile and depends on deep implementation details of Harmony. For this reason, this solution should be replaced with something more reliable.
| * | | Fixed a crash when the currently applied theme is replaced by the ↵Josh Guilfoyle2010-12-221-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageManager. When a package is removed but still has active AssetManager's referring to it, a request to retrieve the resource path (the APK) will fail, so the assets cannot be removed. The AssetManager's removeAssetPath API was adjusted to now accept a cookie instead of searching for it by the supplied asset path. This allows us to still remove asset paths that are no longer available. Change-Id: I862c66e7515a1b05ca3e47f82e52cdf2f1d95684
| * | | Introduced an asset redirection system to the theme engine.Josh Guilfoyle2010-12-224-2/+836
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the theme engine required careful redirection of only the highest-level "theme" style element, relying then on the theme attribute lookups to satisfy the demands of all themeable apps. This approach created significant challenges which required, in some cases, heavy modification for existing applications to support the engine. Custom widgets and themed components required special theme support in order to be reachable by the style engine alone. Similarly, a number of clumsy hacks were required around the framework to support certain components such as menus and tab widgets. The asset redirection system allows the theme to specify a redirection table which is consulted for nearly all final resource resolutions. This essentially means that once the theme is applied, any original resource being redirected would no longer be accessible by the AssetManager, instead being redirected to the matching resource in the theme itself. In order for this to function efficiently it is necessary to create cache files mapping resource integers from one package to another, even if those integers will change across releases. For this, one-time name to integer conversions occur, with the results written in a data format suitable for efficient reads for each AssetManager created. Currently this format must be parsed and cannot be directly mmaped though this will be addressed in future commits. Change-Id: Ie36e74314c600a72e03e568675a38801b7acd1ee
| * | | Updated copyright headers.Josh Guilfoyle2010-11-182-0/+2
| | | | | | | | | | | | | | | | Change-Id: I4824be066a98194b4f7fa9a18682bf6701e069a6
| * | | Merge commit 'themes/themes-eclair' into themes-2.2_r1Dirk Sigurdson2010-07-043-74/+348
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: api/current.xml core/java/android/app/ActivityManager.java core/java/android/app/ActivityThread.java core/java/android/app/ApplicationContext.java core/java/android/content/Intent.java core/java/android/content/pm/PackageInfo.java core/java/android/content/res/AssetManager.java core/java/android/content/res/Configuration.java core/jni/android_util_AssetManager.cpp media/java/android/media/Ringtone.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/am/ActivityManagerService.java test-runner/android/test/mock/MockPackageManager.java
| | * | | Removed dynamic attribute assignment and related debug.Josh Guilfoyle2010-03-011-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This feature was originally used to support on-the-fly changes to themes such as colors. This support has long since been abandoned.
| | * | | Merge remote branch 'korg/eclair' into themes-eclairDirk Sigurdson2010-02-0732-435/+770
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/app/ActivityThread.java core/java/android/content/pm/ActivityInfo.java core/java/android/content/res/AssetManager.java
| | * | | | Fix a potential crash in AssetManager during cleanup.Sergey Ten2009-12-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | CR: Josh Guilfoyle
| | * | | | Merge branch 'themes-1.5r2' into themes-eclairJosh Guilfoyle2009-11-243-74/+370
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: api/current.xml core/java/android/app/ActivityThread.java core/java/android/app/ApplicationContext.java core/java/android/app/Dialog.java core/java/android/app/SearchDialog.java core/java/android/content/Context.java core/java/android/content/Intent.java core/java/android/content/pm/PackageInfo.java core/java/android/content/pm/PackageParser.java core/java/android/content/res/Configuration.java core/java/android/content/res/Resources.java core/java/android/widget/RemoteViews.java core/java/android/widget/TabWidget.java core/java/com/android/internal/os/ZygoteInit.java core/jni/android_util_AssetManager.cpp core/res/AndroidManifest.xml core/res/res/layout/search_dropdown_item_2line.xml core/res/res/layout/select_dialog_item.xml core/res/res/layout/select_dialog_multichoice.xml core/res/res/layout/select_dialog_singlechoice.xml core/res/res/layout/tab_indicator.xml core/res/res/values/attrs.xml core/res/res/values/public.xml core/res/res/values/strings.xml core/res/res/values/themes.xml libs/utils/Android.mk libs/utils/AssetManager.cpp media/java/android/media/RingtoneManager.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java services/java/com/android/server/am/ActivityManagerService.java services/java/com/android/server/status/StatusBarService.java tools/aapt/Main.cpp
| | | * | | | Add support for modifying ResTable on fly.Sergey Ten2009-09-232-52/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to either delete or add asset path after a ResTable object has been created for a given AssetManager. In past, the lack of such support forced us to implement update configuration functionality suboptimally, by recreating new AssetManager object from scratch on theme change. With this change, we can simply remove the "old" theme asset path and add the new asset path. We also need to make sure the Resources object nukes internal caches. CR:JoshG.
generated by cgit v1.1 at 2025-08-16 09:17:26 +0000