summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" ↵Adam Powell2012-10-013-31/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayoutAdam Powell2012-10-013-31/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MeasureSpec.makeMeasureSpec has a bug where a negative or very large size parameter will cause the resulting MeasureSpec value to overflow. RelativeLayout partially relies on this when measuring children with mode UNSPECIFIED; a default value of -1 in a local variable ends up being passed to makeMeasureSpec, overflowing a mode value to create a measurespec that is very large in size, with AT_MOST as the mode. The correct behavior is for RelativeLayout to propagate the UNSPECIFIED mode. Unfortunately a number of custom view implementations in apps rely on the buggy behavior as they do not implement their own onMeasure method. This makes them fall back to View's default onMeasure implementation, which accepts the spec's size unconditionally for AT_MOST or EXACTLY modes, but falls back on getSuggestedMinimum[Width|Height] for UNSPECIFIED. If the view had no background drawable with dimensions and no minWidth field set, this fix for RelativeLayout causes some views to measure with a size of 0 rather than a size of the 30-bit version of 0xFF... Revert these fixes in the interests of compatibility. The next version will conditionally use the new behavior if targetSdk > JB-MR1. This also required reverting a fix for ImageView's adjustViewBounds functionality, as it cannot be implemented reliably if this RelativeLayout fix is not also in place. Revert "Fix UNSPECIFIED measurement in RelativeLayout" This reverts commit 132a742b94b9716451ddef30cec20548b346f1b9. Revert "Fix adjustViewBounds handling for ImageView" This reverts commit d5edc7721791ad807b9a8fbd923b8d6e73c399cc.
* | | | | | | Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-devJeff Brown2012-10-011-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Enable hardware acceleration for pointer location overlay. Disable use of twilight mode for auto-brightness. Use new API to override user activity timeout from keyguard.
| * | | | | | | Disable use of twilight mode for auto-brightness.Jeff Brown2012-10-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adjustment is still experimental. Bug: 7165399 Change-Id: I3fcf361933995d02a5329eeaec80155b39371ba3
* | | | | | | | Merge "New internal API to eliminate poke locks." into jb-mr1-devJeff Brown2012-10-013-29/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | New internal API to eliminate poke locks.Jeff Brown2012-10-013-29/+40
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new WindowManager.LayoutParams inputFeatures flag to disable automatic user activity behavior when an input event is sent to a window. Added a new WindowManager.LayoutParams field userActivityTimeout. Bug: 7165399 Change-Id: I204eafa37ef26aacc2c52a1ba1ecce1eebb0e0d9
* | | | | | Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-devFabrice Di Meglio2012-10-011-19/+42
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix bug #7259242 text is left justified with no paddingFabrice Di Meglio2012-10-011-19/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (padding is hard) - set correct values to mUserPaddingLeftInitial / mUserPaddingRightInitial - reset padding to initial values depending on layout direction Change-Id: I5cfb941b4874eafbfcfb5e2926f5a3c80b4931d3
* | | | | | Merge "MediaRouter/Wifi Display improvements" into jb-mr1-devAdam Powell2012-10-011-3/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | MediaRouter/Wifi Display improvementsAdam Powell2012-10-011-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't select the default route on initialization in a process * Add "connecting" state to MediaRouteButton Bug 7258981 Bug 7262522 Change-Id: I5cd39b09843783b7e1e17620ca33193f0f3b8fca
* | | | | | Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, ↵Fabrice Di Meglio2012-10-011-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Farsi): Play settings" into jb-mr1-dev
| * | | | | Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play ↵Fabrice Di Meglio2012-09-301-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings - add CheckedTextViewStyle with "viewStart" as default text alignment - fix some typos Change-Id: Ia8161c48faf579c89ba5ed49a436e4269178b8c1
* | | | | Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-devJeff Sharkey2012-10-011-24/+34
|\ \ \ \ \
| * | | | | Move bluetooth priorities from Secure to Global.Jeff Sharkey2012-10-011-24/+34
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 7231171 Change-Id: I836fdc2cfb8d67f984b4715559b9e92d0dc41c95
* | | | | Merge "Remove clearUserActivityTimeout()." into jb-mr1-devJeff Brown2012-10-011-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove clearUserActivityTimeout().Jeff Brown2012-09-301-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This function is not implemented and not needed. Bug: 7165399 Change-Id: Ib1c50fabad6292ccf670404ba70aeb1242c4614d
* | | | Merge "Construct a task stack for picking a wifi network from notification" ↵Adam Powell2012-10-012-0/+39
|\ \ \ \ | |_|_|/ |/| | | | | | | into jb-mr1-dev
| * | | Construct a task stack for picking a wifi network from notificationAdam Powell2012-09-302-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7001327 Change-Id: I5a79e6933cd33386cd0aa4df626f15902deedd67
* | | | Status bar: Keep disabled state per user.John Spurlock2012-10-011-0/+1
| |_|/ |/| | | | | | | | | | | Bug:7165607 Change-Id: If6f7a41c2516996612aef5e013dd0d2bd23f9084
* | | Merge "Fix texture corruption" into jb-mr1-devChet Haase2012-09-304-0/+24
|\ \ \
| * | | Fix texture corruptionChet Haase2012-09-304-0/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When memory gets low on a device, activities flush everything they can. Hardware-accelerated activites, such as Launcher, flush GL resources and destroy the GL context. However, some resources were still hanging around, due to deferred destruction policies (we don't delete layers until the DisplayLists they are in are finalized, to ensure we don't deref deleted objects). This meant that we were referring to obsolete GL data in these objects. in particular, it meant that we might come around later, after a new GL context was created, and delete a texture object that was incorrect. We use the layer's "texture id" to refer to the texture underlying the layer. But if there's a new GL context, then this texture ID is no longer valid, and we may be deleting the texture that a different object (layer, icon, whatever) is referring to, because the driver may return that same ID under the new GL context. The fix is to more aggressively delete things that we know will not be used again when the GL context is destroyed. In particular, we delete all resources being used by all DisplayLists at GL context destruction time. Issue #7195815 Textures corruption on all devices, in many apps Change-Id: I52d2d208173690dbb794a83402d38f14ea4c6c22
* | | Merge "Work on issue #6949468: ↵Dianne Hackborn2012-09-302-5/+81
|\ \ \ | |_|/ |/| | | | | android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
| * | Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...Dianne Hackborn2012-09-302-5/+81
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...#testScreenLayout failures on JO This doesn't actually fix it; I have concluded that the test is broken (the platform is correctly reporting that this is a NOT LONG device because in portrait once you account for the status bar and system bar our size is 880dp high and 600dp wide, which is not enough for us to be in the LONG config). However while working on this I noticed that the code for computing the configuration of the external display was wrong. I have fixed that by putting this code for computing these parts of the configuration in a common place that both the window manager and external display code can use. Change-Id: Ic6a84b955e9ec345a87f725203a29e4712dac0ad
* | Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-devAdam Powell2012-09-301-5/+17
|\ \ | |/ |/|
| * Fix UNSPECIFIED measurement in RelativeLayoutAdam Powell2012-09-301-5/+17
| | | | | | | | | | | | | | | | Explicitly handle UNSPECIFIED MeasureSpec mode. Bug 7258418 Change-Id: Idc7b4f0a4a92505379eb5479a84665f7908fcb83
* | Merge "Update APIs to JB MR1 level 17." into jb-mr1-devDianne Hackborn2012-09-301-1/+7
|\ \
| * | Update APIs to JB MR1 level 17.Dianne Hackborn2012-09-301-1/+7
| | | | | | | | | | | | | | | | | | 17 is current, resources are fixed, cleanup is done. Change-Id: I6de446e209f59c5dd5fe1cde311776ab222817ea
* | | Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-devAdam Cohen2012-09-301-9/+2
|\ \ \
| * | | Getting rid of keyguard widget flag that isn't usedAdam Cohen2012-09-281-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | -> issue 7238875 Change-Id: Ifad890b4061784889f3fc7711a165452cf230fbd
* | | | Merge "Changing debug for b/7094175." into jb-mr1-devCraig Mautner2012-09-301-2/+0
|\ \ \ \
| * | | | Changing debug for b/7094175.Craig Mautner2012-09-291-2/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Fixes bug 7094175 (but not really). Change-Id: Ice2abb93f479ea0bda931e9643710668c25aa285
* | | | Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, ↵Fabrice Di Meglio2012-09-302-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | Farsi): Play settings" into jb-mr1-dev
| * | | | Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play ↵Fabrice Di Meglio2012-09-302-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings - do not need those variables. Use what we already have in View. - reset padding to initial values before changing it. Change-Id: Ib396b3dca6e98a94d83a538a9b594b5eb426c453
* | | | | Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug ↵Romain Guy2012-09-301-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | #7257930" into jb-mr1-dev
| * | | | Perform a long computation to catch bitmap sizes > 32 bitsRomain Guy2012-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7257930 Change-Id: I28d08024fabe8103251d480524b0b0f2fd2d2aba
* | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-304-31/+18
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-284-31/+18
| | | | | | | | | | | | | | | | | | | | | | | | - remove onPaddingChanged(int) and fold it into onRtlPropertiesChanged(int) Change-Id: I1d7f02d2b4538c6c991bd4285501bbc73e6aa5c3
* | | | Merge "Get rid of preventScreenOn()." into jb-mr1-devJeff Brown2012-09-281-1/+0
|\ \ \ \
| * | | | Get rid of preventScreenOn().Jeff Brown2012-09-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7165399 Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
* | | | | Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into ↵Dianne Hackborn2012-09-283-619/+640
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | jb-mr1-dev
| * | | | Fix issue #7255954: API Review: rename Dream to DreamServiceDianne Hackborn2012-09-283-619/+640
| | | | | | | | | | | | | | | | | | | | Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
* | | | | Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-devAdam Powell2012-09-282-1/+14
|\ \ \ \ \
| * | | | | Fix adjustViewBounds handling for ImageViewAdam Powell2012-09-282-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When computing the adjusted view bounds, don't constrain the dimensions by the original estimate if the opposite dimension has a fixed size. This can result in the view never getting properly enlarged. Also fix a long-standing bug in MeasureSpec.makeMeasureSpec where oversized or negative values could result in broken packed values. Bug 7240251 Change-Id: I359d108ff52b6f3b5c4bf393d2271d28999c0127
* | | | | | Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, ↵Fabrice Di Meglio2012-09-281-1/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | Farsi): Play settings" into jb-mr1-dev
| * | | | Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play ↵Fabrice Di Meglio2012-09-281-1/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | settings - fix padding issue. Need to update padding if layout direction change Change-Id: I2924c1b94c7ef054dd9bd670de4c5c206f52e412
* | | | Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into ↵Dianne Hackborn2012-09-286-2/+46
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | Fix issue #7211769 and #7244492, thrash around on #7226656.Dianne Hackborn2012-09-286-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #7211769: Crash dialog from background user has non-working "report" The report button now launches the issue reporter for the correct user. Also for crashes on background users, either disable the report button, or simply don't show the dialog depending on the build config. Issue #7244492: Bugreport button in Quick Settings doesn't actually do anything Now they do. Issue #7226656: second user seeing primary user's apps I haven't had any success at reproducing this. I have tried to tighten up the path where we create the user to ensure nothing could cause the user's applications to be accessed before the user it fully created and thus make them installed... but I can't convince myself that is the actual problem. Also tightened up the user switch code to use forground broadcasts for all of the updates about the switch (since this is really a foreground operation), added a facility to have BOOT_COMPELTED broadcasts not get launched for secondary users and use that on a few key system receivers, fixed some debug output. Change-Id: Iadf8f8e4878a86def2e495e9d0dc40c4fb347021
* | | | | Merge "Use updatable file for premium-sms filter" into jb-mr1-devRobert Greenwalt2012-09-281-7/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use updatable file for premium-sms filterRobert Greenwalt2012-09-281-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data is really to big for a gservices-driven secure setting. bug:7221402 Change-Id: Ie3d4a1a0aeb69b9ef8fad360fa7ec32e927644e8
* | | | | Merge "Track offset of center child view in Gallery for later layouts" into ↵Adam Powell2012-09-281-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | jb-mr1-dev