summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix crash in ShapeDrawable" into jb-mr1-devRomain Guy2012-09-071-2/+10
|\
| * Fix crash in ShapeDrawableRomain Guy2012-09-071-2/+10
| | | | | | | | Change-Id: Ibc277db46912a73dc3f971f8487baa5eafa8bc84
* | Merge "Don't hide the PIN keyboard even when a physical keyboard is ↵Jim Miller2012-09-071-3/+9
|\ \ | | | | | | | | | present." into jb-mr1-dev
| * | Don't hide the PIN keyboard even when a physical keyboard is present.Jim Miller2012-09-071-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally this was done for aesthetics when we had a physical keyboard on devices. The code also used to hide the PIN keyboard when a BT keyboard is attached. We now always show the keyboard, even when a physical keyboard is present. Change-Id: I8e1f3af200071382bfe267c28d92062758ebb790
* | | Merge "Add Binder.getCallingUserHandle()." into jb-mr1-devDianne Hackborn2012-09-073-2/+15
|\ \ \
| * | | Add Binder.getCallingUserHandle().Dianne Hackborn2012-09-073-2/+15
| | | | | | | | | | | | | | | | Change-Id: I2a7eedfdc7baeeb4c2cd2ca0153aa95e0cf0bf45
* | | | Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-devJim Miller2012-09-076-117/+102
|\ \ \ \
| * | | | Enable lazy-loading of security views in keyguardJim Miller2012-09-076-117/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes all but the default KeyguardSelectorView from KeyguardViewHost to (1) reduce the overall memory footprint (2) reduce initial layout inflation time and (3) avoid initializing the camera until needed by face unlock. Fixes bug 7127666 Change-Id: Ibac1838dd7a490dcadbfab5bdfdd82734b69055a
* | | | | Merge "Log all individual settings restored" into jb-mr1-devChristopher Tate2012-09-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Log all individual settings restoredChristopher Tate2012-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to get a handle on bug 7129406 Change-Id: If436c7888f0a8565d83c03024c54ea6ec83e7955
* | | | | Merge "Explicitly specify current user everywhere home is started." into ↵Dianne Hackborn2012-09-073-13/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | jb-mr1-dev
| * | | | Explicitly specify current user everywhere home is started.Dianne Hackborn2012-09-073-13/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I58d86136de7f9cef1eaf72793d0e200b852d7355
* | | | | Disable hardcoded wifi display adapter.Jeff Brown2012-09-071-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id0f7d59b6eafa8794ff7616cf54a0b94ba78c763
* | | | | Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-devSvetoslav Ganov2012-09-071-2/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixing off by one error in the ScreenMagnifier.Svetoslav Ganov2012-09-071-2/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia0ccfb6b354b7a18633e7cf26647c6436ebf5c08
* | | | | Merge "Make mirroring automatic based on Windows on display." into jb-mr1-devJeff Brown2012-09-074-19/+150
|\ \ \ \ \
| * | | | | Make mirroring automatic based on Windows on display.Craig Mautner2012-09-074-19/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell the display manager whenever a given logical display contains interesting windows. If so, then the display manager arranges to show that content on a physical display, otherwise it ignores the logical display and makes its associated primary physical display mirror the default display. Assign DisplayContents when Displays are added, remove them when Displays are removed, and update the DisplayInfo when Displays change. Change-Id: I36e08ec538055acabe1e24cdd12c40de4e47a158
* | | | | | Merge "Add support for Wifi display." into jb-mr1-devJeff Brown2012-09-0719-138/+1441
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add support for Wifi display.Jeff Brown2012-09-0719-138/+1441
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
* | | | | | Merge "installd: fix forward locking symlink" into jb-mr1-devNick Kralevich2012-09-073-8/+21
|\ \ \ \ \ \
| * | | | | | installd: fix forward locking symlinkNick Kralevich2012-09-073-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installd was not creating a compatibility symlink when installing a forward locked application. Fix. Bug: 7121527 Change-Id: Ied507ab2b759d8658af563e6ac8f0dbb0d286cce
* | | | | | | Merge "Move verification settings to Settings.Global" into jb-mr1-devrich cannings2012-09-073-10/+51
|\ \ \ \ \ \ \
| * | | | | | | Move verification settings to Settings.Globalrich cannings2012-09-073-10/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Settings.Secure.PACKAGE_VERIFIER_ENABLE, Settings.Secure.PACKAGE_VERIFIER_TIMEOUT, Settings.Secure.PACKAGE_VERIFIER_DEFAULT_RESPONSE to Settings.Global.PACKAGE_VERIFIER_ENABLE, Settings.Global.PACKAGE_VERIFIER_TIMEOUT, Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE, respectively. Bug: 7082362 Change-Id: I21fde031a330563891c0129132f3d6369ac5e7a5
* | | | | | | | Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-devDianne Hackborn2012-09-072-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix crash when setting wallpaper from non-primary user.Dianne Hackborn2012-09-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing a content provider, there is a check for whether the provider can run in the caller's process; if so, even if the provider is currently published, we return to the caller that it can run locally. This check was broken -- it had an old condition that allowed content providers owned by the system UID to run in any other UID's process. This is wrong, since by definition the other UIDs would not be able to access the data under the original UID. We ran into this because the activity picker is part of the android platform manifest, so runs as the system process. However it needs to run as the user who invoked it, so when coming from the non-primary user we spin up a "system" process running as a uid of that user. Now when that process tries to access the settings provider, the broken check would think that a new instance of the settings provider should be created in the caller's process. Change-Id: I7bf495ed8370cb271bdaec073d5b7dda9e38c546
* | | | | | | | | Merge "Fix incorrect indexing calculation." into jb-mr1-devCraig Mautner2012-09-071-4/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix incorrect indexing calculation.Craig Mautner2012-09-071-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 7129583. Change-Id: Ia395a7acded05686668d5b3cee09d49025a9f339
* | | | | | | | | | Merge "Add greyscale intrinsic test." into jb-mr1-devJason Sams2012-09-072-6/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add greyscale intrinsic test.Jason Sams2012-09-062-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24c9b8769ab7fe2fed9ef17f7ff1063c60977c41
* | | | | | | | | | | Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-devJason Sams2012-09-077-8/+120
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Document ColorMatrix intrinsic and add helpersJason Sams2012-09-067-8/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase size of test image. Add helpers for greyscale and yuv<>rgb conversions Change-Id: I6cdd06ae23623b47f5034585ed5d385ff11348ac
* | | | | | | | | | Merge "Resolve the correct home intent for secondary users" into jb-mr1-devAmith Yamasani2012-09-072-9/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve the correct home intent for secondary usersAmith Yamasani2012-09-072-9/+29
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some searches through the Activity stack. This allows SetupWizard to be launched for the second user. Change-Id: Icd306319f511c902557bd9985d80dda228e32d96
* | | | | | | | | | Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-devChris Craik2012-09-072-5/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle different x, y scales in drawLines AA pathChris Craik2012-09-072-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7114630 Fixes different x, y scales, and fixes boundaryWidthProportion to be from center, not edge. Also adds drawLine tests that previously drew blurry. Change-Id: I2b648a60361ad3931eac67647b9b27909525ee1e
* | | | | | | | | | | am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ff437745ec1e3463d4e7b831bf2b173aa38dad4': DO NOT MERGE - Make WebView track focal points more accurately DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
| * | | | | | | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e3c8a0ea72c31ae91cdbd6453c32d8c6901a29a
| | * | | | | | | | | | DO NOT MERGE - Make WebView track focal points more accuratelyAdam Powell2012-09-062-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
| | * | | | | | | | | | DO NOT MERGE - Delay starting scale gesture events until a touch slop thresholdAdam Powell2012-09-061-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
* | | | | | | | | | | | Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into ↵Raph Levien2012-09-072-99/+96
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | | Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGEElliott Hughes2012-09-072-99/+96
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two reported by users, the other spotted by inspection. Bug: http://code.google.com/p/android/issues/detail?id=16002 Bug: http://code.google.com/p/android/issues/detail?id=22225 Change-Id: I86fe022fda4af68e5a6fb9dc5dd2abdb75e9d966 This was committed to master, cherry-picking to jb-mr1-dev
* | | | | | | | | | | | Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into ↵Christopher Tate2012-09-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespaceChristopher Tate2012-09-071-2/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It moved from System to Global, so writes are not automatically redirected to the new namespace (else apps would start crashing). Bug 7126575 Change-Id: Ief31fcb5a6107a098da04d30d146e16921dee776
* | | | | | | | | | | Merge "AudioSystem: new audio device enums" into jb-mr1-devEric Laurent2012-09-071-11/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AudioSystem: new audio device enumsEric Laurent2012-09-071-11/+44
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update audio device enums to match new definitions in native framework. Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
* | | | | | | | | | | Merge "Enable changing properties of layer paint" into jb-mr1-devChet Haase2012-09-0713-52/+189
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Enable changing properties of layer paintChet Haase2012-09-0713-52/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, to draw a layered view with a changed Paint object for the drawLayer operation, you'd have to invalidate the parent view, to get the native DisplayList to pick up the new Paint properties. This change adds API and functionality so that the developer can call setLayerPaint(), which does the proper invalidation (lightweight, doesn't cause redrawing the view). Issue #6923810 Make it easy to efficiently animate a layer's Paint Change-Id: I7fea79788d50f6d9c86dd5e5b2a4490cb95142bb
* | | | | | | | | | | Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into ↵Christopher Tate2012-09-071-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespaceChristopher Tate2012-09-071-6/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the one relevant setting that moved from System to Global, a move that we do not automatically redirect on writes. Change-Id: I7b26d0c364695c4a10a7cd477db3dfcfe89d7ef5
* | | | | | | | | | Merge "More multi-user stuff:" into jb-mr1-devDianne Hackborn2012-09-0717-304/+543
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-03-28 09:59:27 +0000