85810 Commits

Author SHA1 Message Date
Amith Yamasani
4cf0548452 am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev
* commit '5fc626639aa7ff2aed224b58891149e19fb24b57':
  Resolve the correct home intent for secondary users
2012-09-07 15:31:37 -07:00
Chris Craik
0d11ac12a2 am dc531fa7: Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev
* commit 'dc531fa7d4ec545ace1b3daae0849d3101102e49':
  Handle different x, y scales in drawLines AA path
2012-09-07 15:29:59 -07:00
Amith Yamasani
5fc626639a Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 2012-09-07 15:28:09 -07:00
The Android Open Source Project
100e36f2c2 am 330a5bf8: am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '330a5bf82e60fca9591f14a4db5ee98066c610d1':
  DO NOT MERGE - Make WebView track focal points more accurately
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-07 15:27:06 -07:00
Chris Craik
dc531fa7d4 Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 2012-09-07 15:27:05 -07:00
The Android Open Source Project
330a5bf82e am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge
* 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
2012-09-07 15:24:05 -07:00
The Android Open Source Project
2ff437745e Reconcile with jb-mr0-release - do not merge
Change-Id: I1e3c8a0ea72c31ae91cdbd6453c32d8c6901a29a
2012-09-07 15:21:16 -07:00
Chris Craik
75040f8a77 Handle different x, y scales in drawLines AA path
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
2012-09-07 15:20:38 -07:00
Raph Levien
3b43678ca7 am 965e7ff4: Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev
* commit '965e7ff4de117a9681b04e84573cb5924efdd6d9':
  Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
2012-09-07 15:11:01 -07:00
Raph Levien
965e7ff4de Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 2012-09-07 15:08:42 -07:00
Christopher Tate
20779a1ace am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev
* commit 'd6a53c3156fbfa63c88fad536cfac126eea6718d':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
2012-09-07 15:05:53 -07:00
Amith Yamasani
259d5e56a8 Resolve the correct home intent for secondary users
Fix some searches through the Activity stack.

This allows SetupWizard to be launched for the second user.

Change-Id: Icd306319f511c902557bd9985d80dda228e32d96
2012-09-07 15:04:36 -07:00
The Android Open Source Project
07cdbadc17 Reconcile with jb-mr1-release - do not merge
Change-Id: I78543f98dd668123d26915177c2c65ed01b9d2be
2012-09-07 15:03:50 -07:00
Christopher Tate
d6a53c3156 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 2012-09-07 15:02:38 -07:00
Christopher Tate
62df6eb508 Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
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
2012-09-07 15:00:54 -07:00
Eric Laurent
bf20314a8a am 7c026320: Merge "AudioSystem: new audio device enums" into jb-mr1-dev
* commit '7c0263204384cfa58183b9badcaccdac88efdf72':
  AudioSystem: new audio device enums
2012-09-07 14:56:48 -07:00
Eric Laurent
7c02632043 Merge "AudioSystem: new audio device enums" into jb-mr1-dev 2012-09-07 14:53:29 -07:00
Chet Haase
39b72a7aae am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev
* commit '89b3f48fa3ccaf9a05628f0e540c1f94716809f7':
  Enable changing properties of layer paint
2012-09-07 14:46:43 -07:00
Craig Mautner
722285e199 Make mirroring automatic based on Windows on display.
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
2012-09-07 14:46:32 -07:00
Chet Haase
89b3f48fa3 Merge "Enable changing properties of layer paint" into jb-mr1-dev 2012-09-07 14:44:43 -07:00
Ben Murdoch
040887f12a Merge "Proxy View.dispatchDraw through WebViewProvider." 2012-09-07 14:31:15 -07:00
Ben Murdoch
e623e24484 Proxy View.dispatchDraw through WebViewProvider.
Provide a no-op implementation in WebViewClassic.

Change-Id: I44e64c261fb8b4387cb53f0625300c3527ba2e40
2012-09-07 22:26:32 +01:00
Christopher Tate
f1c675bccd am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev
* commit 'c0be8c85b09002359adb1fb20f2bf08e6983d146':
  Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
2012-09-07 14:25:24 -07:00
Christopher Tate
c0be8c85b0 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 2012-09-07 14:22:59 -07:00
Christopher Tate
ad73532041 Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
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
2012-09-07 14:19:43 -07:00
Dianne Hackborn
00b7d2a0de am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev
* commit '649d0d71b245d88746b78399ffa1f75da7c80974':
  More multi-user stuff:
2012-09-07 14:14:13 -07:00
Dianne Hackborn
649d0d71b2 Merge "More multi-user stuff:" into jb-mr1-dev 2012-09-07 14:11:56 -07:00
Romain Guy
f9dd3811a3 am 55e6b77b: Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev
* commit '55e6b77bda7da1684ca32493d9e03184bd441dab':
  Reduce the number of locks acquired by display lists
2012-09-07 14:04:05 -07:00
Romain Guy
55e6b77bda Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev 2012-09-07 14:01:31 -07:00
Romain Guy
58ecc204fb Reduce the number of locks acquired by display lists
Change-Id: I1123aae0355de84db705bb75042c7083fc69c9f2
2012-09-07 14:01:09 -07:00
Dianne Hackborn
5e03e2ca7d More multi-user stuff:
- New (hidden) isUserRunning() API.
- Maintain LRU list of visited users.
- New FLAG_IS_DATA_ONLY for ApplicationInfo.
- Clean up pending intent records when force-stopping a user (or package).
  (Also fixes bug #6880627: PendingIntent.getService() returns stale
  intent of force stopped app)
- Fix force-stopping when installing an app to do the force-stop across
  all users for that app.
- When selecting which processes to kill during a force stop, do this
  based on the actual packages loaded in the process, not just process
  name matching.
- You can now use --user option in am when starting activities, services,
  and instrumentation.
- The am --user option accepts "current" and "all" as arguments.
- The pm uninstall command now uninstalls for all users, so it matches
  the semantics of the install command.
- PhoneWindowManager now explicitly says to start home in the current
  user.
- Activity manager call to retrieve the MIME type from a content provider
  now takes a user argument, so it will direct this to the proper user.
- The package manager uninstall paths are now implemented around
  PackageSetting, not PackageParser.Package.  This allows them to work
  even if the application's apk has been removed (in which case it only
  exists as a PackageSetting, not the PackageParser.Package parsed from
  the apk).

Change-Id: I3522f6fcf32603090bd6e01cc90ce70b6c5aae40
2012-09-07 13:55:23 -07:00
Mike Dodd
d6f041203a am e0bd3fe8: am 37ee5342: Merge "Add context support to backdropper filter." into jb-mr1-dev
* commit 'e0bd3fe8329080fbcae20b182fe632af14195de5':
  Add context support to backdropper filter.
2012-09-07 13:48:32 -07:00
Dianne Hackborn
15f91d9151 am 417984dc: Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev
* commit '417984dc0d27bdd1b33ae3115593f609961a0c15':
  Wrapped call to notifyAll() in a synchronized block
2012-09-07 13:30:30 -07:00
Dianne Hackborn
417984dc0d Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev 2012-09-07 13:27:47 -07:00
Chet Haase
d15ebf25c5 Enable changing properties of layer paint
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
2012-09-07 13:27:02 -07:00
Jeff Brown
cbad976b2a Add support for Wifi display.
Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
2012-09-07 13:26:31 -07:00
Adam Koch
173166a230 am 14c62518: am aa98d509: am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other
* commit '14c625188affcce2e6db3c8b2f96b63eeb0f10a0':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
2012-09-07 13:22:01 -07:00
Adam Koch
14c625188a am aa98d509: am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor update
* commit 'aa98d509500ba963f9dcda55073f312ee643cb46':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
2012-09-07 13:20:16 -07:00
Adam Koch
aa98d50950 am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor updates" into jb-de
* commit '6525f7bfcfaf66fe0d549cb3c3d22a751535932e':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
2012-09-07 13:17:45 -07:00
Adam Koch
6525f7bfcf Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor updates" into jb-dev 2012-09-07 13:15:02 -07:00
Christopher Tate
041aa46a85 am 970683c5: Merge "Further fixup of migration to global settings" into jb-mr1-dev
* commit '970683c5d42a1d8588d656d4e570ce4f0f6e0abc':
  Further fixup of migration to global settings
2012-09-07 12:58:15 -07:00
Christopher Tate
970683c5d4 Merge "Further fixup of migration to global settings" into jb-mr1-dev 2012-09-07 12:56:42 -07:00
Elliott Hughes
5ef49427b6 Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
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
2012-09-07 12:42:18 -07:00
Christopher Tate
9219874be9 Further fixup of migration to global settings
The Settings.System.STAY_ON_WHILE_PLUGGED element should have been
migrated to the global table, but wasn't.  This CL does a couple of
things around dealing with this:

(1) Tidies up the migration tables outright, so that they correctly
    reflect the intended final state

(2) Introduces the option of doing a key migration only if the element
    has not yet been moved to the new table, to allow for safe retry-
    -with-ignore.  This will make it easy to make any future alterations
    to the global vs per-user association of individual elements

(3) Migrates the STAY_ON_WHILE_PLUGGED element if it hasn't been already.

Bug 7126575

Change-Id: Ic5fa9ba45f11b09270bd5bc94c26fbbd84abc749
2012-09-07 12:00:13 -07:00
Teng-Hui Zhu
f6cc1ddc35 am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev
* commit '4db5d23deab9ea8de34cdb1c56af31e6e3cff79b':
  Back key to dismiss full screen video
2012-09-07 11:51:51 -07:00
Teng-Hui Zhu
4db5d23dea Merge "Back key to dismiss full screen video" into jb-mr1-dev 2012-09-07 11:49:54 -07:00
Fabrice Di Meglio
8bcf577aa0 am d672d29d: Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev
* commit 'd672d29dd03ffc148b629c1abbd00bd9dc88be80':
  Update documentation for layout direction qualifiers for Resouces
2012-09-07 11:42:20 -07:00
Fabrice Di Meglio
778d7508df am bae1d478: Merge "Fix the build" into jb-mr1-dev
* commit 'bae1d478964f609f4ed37d629ed3247a12ed312e':
  Fix the build
2012-09-07 11:40:44 -07:00
Fabrice Di Meglio
d672d29dd0 Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev 2012-09-07 11:39:27 -07:00
Fabrice Di Meglio
bae1d47896 Merge "Fix the build" into jb-mr1-dev 2012-09-07 11:37:35 -07:00