102331 Commits

Author SHA1 Message Date
Elliott Hughes
ab8278e2eb am 54519e70: Fix build.
* commit '54519e7041c9e30cefa1a175563f6a2f9bd2e478':
  Fix build.
2013-03-19 09:31:09 -07:00
Elliott Hughes
f7c01e5a8a am eda35cb7: am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit 'eda35cb7c5781a32b038f1ef76b8e50f26f9bfaf':
  Clean up (some of) our many clocks to use H instead of k.
2013-03-19 09:31:04 -07:00
Scott Main
d7cbec6d10 am da9f385a: am 2e1e8928: am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit 'da9f385abc83c459fd87e3cadaec347e91ac5b5c':
  add search tags for Design patterns
2013-03-19 09:31:00 -07:00
Scott Main
6008fca61b am b4b84f64: am d95cad7c: am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit 'b4b84f64401cf559f33bd7af0666c5e04c5478b4':
  add search tags to Design building blocks
2013-03-19 09:30:54 -07:00
Elliott Hughes
c3e513e51c am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
* commit 'c5c6d4167b66c79652c5208a2dfe091a8c735e6d':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-19 09:30:51 -07:00
Scott Main
11f36b80d4 am 0e4071c7: am 426bece0: am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
* commit '0e4071c73b9606de75ce74209eb82708b7cfa3cf':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-19 09:30:39 -07:00
Nick Kralevich
f5eaf95bc5 am 515c20be: Merge "PackageManagerService: honor requestedPermissionsRequired" into jb-mr2-dev
* commit '515c20beb1cc291a4c4a63016c7bc7286e47670c':
  PackageManagerService: honor requestedPermissionsRequired
2013-03-19 15:47:39 +00:00
Nick Kralevich
515c20beb1 Merge "PackageManagerService: honor requestedPermissionsRequired" into jb-mr2-dev 2013-03-19 15:45:23 +00:00
Irfan Sheriff
1ef840cdc7 Add API to control scan always mode
Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed
2013-03-19 07:44:47 -07:00
Chet Haase
58afb2f050 am f4071065: Merge "Fix bug with transientState for listviews without stable IDs" into jb-mr2-dev
* commit 'f4071065b88d5b4acbe8ef102275244636ba9959':
  Fix bug with transientState for listviews without stable IDs
2013-03-19 13:10:48 +00:00
Chet Haase
f4071065b8 Merge "Fix bug with transientState for listviews without stable IDs" into jb-mr2-dev 2013-03-19 13:06:56 +00:00
The Android Automerger
7f1d4be781 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-19 05:55:27 -07:00
Jack Palevich
ea62b95e7c Fix createSurface / eglCreateWindowSurface race.
Previously we could have returned from createSurface on the main thread
before calling eglCreateWindowSurface on the GLThread. That could lead
to a problem because the surface could be destroyed before
eglCreateWindowSurface got a chance to run.

Bug: 8328715
Change-Id: I273149f7d4b165abbe218a91ff54083f3f498cb0
2013-03-18 22:55:27 -07:00
Mathias Agopian
7c116b54b7 make Surface.java internal state thread-safe
it's still incorrect to use Surface from different
threads, however this shouldn't result to native crashes
anymore.

Bug: 8328715
Change-Id: I89ac5cc1218dc5aa0e35f8e6d4737879a442f0c6
2013-03-18 20:29:18 -07:00
Mathias Agopian
ea9758fb9d am ab7409e6: Merge "improve SurfaceControl.screenshot documentation" into jb-mr2-dev
* commit 'ab7409e6376708cf8958f3cfb8f6fce2e7bfc69c':
  improve SurfaceControl.screenshot documentation
2013-03-19 03:22:38 +00:00
Mathias Agopian
ab7409e637 Merge "improve SurfaceControl.screenshot documentation" into jb-mr2-dev 2013-03-19 03:20:11 +00:00
Romain Guy
595b5bdf08 am 603ce559: Merge "Apply ComposeShader\'s local matrix to children" into jb-mr2-dev
* commit '603ce559f290f369ef1a0d0744f1697b36e9c10e':
  Apply ComposeShader's local matrix to children
2013-03-19 02:35:06 +00:00
Romain Guy
603ce559f2 Merge "Apply ComposeShader's local matrix to children" into jb-mr2-dev 2013-03-19 02:31:35 +00:00
Romain Guy
d4289922ce Apply ComposeShader's local matrix to children
Change-Id: Idf9b8e7d7b30f8fcd8ba1fd4bfe8991e9ca148e2
2013-03-18 19:30:48 -07:00
Romain Guy
3c385b3fc0 am 16b7dc9c: Merge "Merge all shapes/paths caches to PathCache" into jb-mr2-dev
* commit '16b7dc9c1ca4336b29afbd2f56f580014863add0':
  Merge all shapes/paths caches to PathCache
2013-03-19 02:06:55 +00:00
Romain Guy
16b7dc9c1c Merge "Merge all shapes/paths caches to PathCache" into jb-mr2-dev 2013-03-19 02:04:29 +00:00
Elliott Hughes
bab316fea2 am e79af7df: Merge "Fix build."
* commit 'e79af7dffbd4c41ab756c5b0888e28bbb317aab3':
  Fix build.
2013-03-18 18:55:42 -07:00
Guang Zhu
f21d2fd5fb am a35d380b: Merge "add reboot and shutdown to svc power command" into jb-mr2-dev
* commit 'a35d380bac61804551d4927df9595980373d2eff':
  add reboot and shutdown to `svc power` command
2013-03-19 01:35:45 +00:00
Romain Guy
c46d07a29e Merge all shapes/paths caches to PathCache
This change will greatly simplify the multi-threading of all
shape types.

This change also uses PathTessellator to render convex paths.

Change-Id: I4e65bc95c9d24ecae2183b72204de5c2dfb6ada4
2013-03-18 18:32:17 -07:00
Guang Zhu
a35d380bac Merge "add reboot and shutdown to svc power command" into jb-mr2-dev 2013-03-19 01:31:17 +00:00
Chris Craik
339f4d2340 Work around saveLayer clipping/transform deferring issues
bug:8409891

Disables deferring

Change-Id: I93498a4a45a5bfe01143faa154926c6a138db8f9
2013-03-18 18:28:19 -07:00
Irfan Sheriff
288319f6ec Fix tethering
Using sendMessageAtFrontofQueue() causes issues here since there can be a start
that is deferred and it basically has no effect. Use defer which is more clean
and obvious here.

Bug: 8410547
Change-Id: I4fbf299283847e7c3009b87a81cb56e765b0e1e1
2013-03-18 18:28:15 -07:00
Guang Zhu
62aad7f66f add reboot and shutdown to svc power command
a runtime shutdown will be performed first, then device will
reboot with the provided reason or power off.

Change-Id: I44cfbae19626c46147fad3bc8e91434970daa5d5
2013-03-18 18:22:30 -07:00
Elliott Hughes
54519e7041 Fix build.
(cherry-pick of 0a65ac90fae79687b46a8e70549204b97e4c951f.)

Change-Id: Idd0feede5bf5ce78f47f9a442019e68f7717a9e4
2013-03-18 18:17:25 -07:00
Fabrice Di Meglio
f7a5cdfac6 Fix bug #8335710 TextView can't clear CompoundDrawables
- fix start/override mechanism
- take care of RTL compatibility mode (pre JB-MR1)
- fix where reset of drawables resolution needs to happen

Change-Id: I55a69487a0eedee14c4be7006ee0abad085200ad
2013-03-18 18:13:16 -07:00
Elliott Hughes
e79af7dffb Merge "Fix build." 2013-03-19 01:11:02 +00:00
Elliott Hughes
0a65ac90fa Fix build.
Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
2013-03-18 18:10:24 -07:00
Craig Mautner
c9e2239efe am aea8b0e5: am 7f7ac5b4: am fda1bff8: Merge "Correct the target app token for input method window"
* commit 'aea8b0e571d9fe6b99b001df73d86d6e67bc276a':
  Correct the target app token for input method window
2013-03-19 00:53:06 +00:00
Craig Mautner
aea8b0e571 am 7f7ac5b4: am fda1bff8: Merge "Correct the target app token for input method window"
* commit '7f7ac5b4a86be479bdede226fd4a2bddcd8a9a2b':
  Correct the target app token for input method window
2013-03-18 17:50:32 -07:00
Elliott Hughes
eda35cb7c5 am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit 'a8974d3f0a799a5d76e226649c878a71b3b5e953':
  Clean up (some of) our many clocks to use H instead of k.
2013-03-18 17:49:47 -07:00
Elliott Hughes
64a277d837 Fix times in debugging output to use H rather than k.
Bug: 8359981
Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
2013-03-18 17:47:22 -07:00
Elliott Hughes
a8974d3f0a Merge "Clean up (some of) our many clocks to use H instead of k." 2013-03-19 00:28:42 +00:00
Elliott Hughes
cdafd37f31 Clean up (some of) our many clocks to use H instead of k.
Bug: 8359981
Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
2013-03-18 17:21:33 -07:00
Chris Craik
7714c0b373 am 4ad2f93c: Merge "Work around saveLayer clipping/transform deferring issues" into jb-mr2-dev
* commit '4ad2f93cff101ffcaea0a9532dc9b17840cd791b':
  Work around saveLayer clipping/transform deferring issues
2013-03-19 00:06:50 +00:00
Chris Craik
4ad2f93cff Merge "Work around saveLayer clipping/transform deferring issues" into jb-mr2-dev 2013-03-19 00:04:10 +00:00
Chris Craik
cada41aeb1 Work around saveLayer clipping/transform deferring issues
bug:8409891

Disables deferring

Change-Id: I93498a4a45a5bfe01143faa154926c6a138db8f9
2013-03-18 17:00:18 -07:00
Scott Main
da9f385abc am 2e1e8928: am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit '2e1e892878ea0612d6e2916ec3849cc3f30f5b72':
  add search tags for Design patterns
2013-03-18 16:57:54 -07:00
Scott Main
2e1e892878 am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit 'a2f808539c13efaf6bb86b607d47dcedd58bb41b':
  add search tags for Design patterns
2013-03-18 16:55:47 -07:00
Scott Main
a2f808539c am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit '49e43bb818d3b8ff5e9c7272d5039b9d2926aac9':
  add search tags for Design patterns
2013-03-18 16:53:56 -07:00
Scott Main
49e43bb818 am e21406cb: add search tags for Design patterns
* commit 'e21406cb963ce00b62cebe14732f1960f877cbec':
  add search tags for Design patterns
2013-03-18 16:52:32 -07:00
Scott Main
e21406cb96 add search tags for Design patterns
Change-Id: I7126bbf88c2160efbca431e3e4caa612abc20bf9
2013-03-18 15:50:55 -07:00
Scott Main
b4b84f6440 am d95cad7c: am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit 'd95cad7c8acd83f50cc0b9567da68f80d454afb0':
  add search tags to Design building blocks
2013-03-18 15:24:56 -07:00
Elliott Hughes
c5c6d4167b am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
* commit '6317315e733f115aa6ad0339c1a334607fd04342':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-18 15:24:31 -07:00
Scott Main
d95cad7c8a am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit '1a7ad2cb1284ae7828dda821a6a94d672e8253af':
  add search tags to Design building blocks
2013-03-18 15:22:09 -07:00
Scott Main
1a7ad2cb12 am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit 'be06c28e733bb2978173dc5dfe5ee9ed0fb9874a':
  add search tags to Design building blocks
2013-03-18 15:19:45 -07:00