Jeff Sharkey
da38ddc26f
am f9ed7dc9: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit 'f9ed7dc96a242d2c583065dfb31a8dafc7825bd0':
2013-03-05 13:03:34 -08:00
Scott Main
9daf107d92
am 10dda9ca: am 00158363: docs: add bdc\'s security doc as training article
...
* commit '10dda9ca64e0d777709f7a9a6b9cae4f94a955f7':
2013-03-05 13:03:32 -08:00
Dirk Dougherty
e1d8df4536
am f80cb186: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev
...
* commit 'f80cb1869e6db8168379d92c81689b486a493c0b':
2013-03-05 13:03:30 -08:00
Scott Main
fbd852bacc
am 9ecd8e7b: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev
...
* commit '9ecd8e7ba1aec4d6edc75f6ae91db04613e6256f':
2013-03-05 13:03:27 -08:00
Scott Main
0f1259ccb7
am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
...
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
docs: clarify startActivity
2013-03-05 13:03:25 -08:00
quddusc
096c7f7b64
am f353c9ed: Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs
...
* commit 'f353c9ed7d0eb59c0663639f2800c5c4e542386c':
docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080
2013-03-05 13:03:22 -08:00
Dirk Dougherty
3f52bde0c3
am 694602ae: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
...
* commit '694602aebc4e398c01a8d6c795cd6ad801f8eecf':
2013-03-05 13:03:20 -08:00
Scott Main
45c5288cf8
am 8da34d97: am 9d167eaa: docs: another string change for developer console bug: 8033647
...
* commit '8da34d97868c888b3f8aa230627ab3b2b87d8d11':
2013-03-05 13:03:17 -08:00
Scott Main
b3ff35adc5
am 06706ba5: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480
...
* commit '06706ba5d66d5c5d937750868be0eecb8ed9b43b':
2013-03-05 13:03:15 -08:00
Jean-Baptiste Queru
18cd97931c
am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '84d3036cf9ee03e118b4cfa857d574e5d3684c98':
2013-03-05 13:03:13 -08:00
Dirk Dougherty
a0c2afbd63
am bde26777: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev
...
* commit 'bde267772d42cddf091ebcc2f18d95977ec6f9a5':
2013-03-05 13:03:10 -08:00
Robert Ly
bd18140128
am 9d09eee5: am af7b843e: docs: remove games references
...
* commit '9d09eee559533535e00be933a38a69ade046d74e':
2013-03-05 13:03:07 -08:00
Robert Ly
0e4e61f1d5
am 1878d080: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev
...
* commit '1878d08046784517d3eedd47993e4a4f8c9a98bd':
2013-03-05 13:03:05 -08:00
Robert Ly
bc382d06d9
am 82370a60: am 05c8e63c: docs: gms and gcm javadocs
...
* commit '82370a60b2eac88fd763093eba61e45326892a41':
2013-03-05 13:03:02 -08:00
Joe Malin
7865c6f041
am e35ae88b: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit 'e35ae88b3e9ac28a19c35b8982a07c877e235f68':
2013-03-05 13:03:00 -08:00
Scott Main
552ac879ab
am cdc57997: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'cdc579973440b2a5d75c095b1cf4e12c1818f1d3':
2013-03-05 13:02:57 -08:00
Dirk Dougherty
ed40f2a681
am 2caba1f7: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit '2caba1f763faf0656e2f27a9a422ada5908488c2':
2013-03-05 13:02:55 -08:00
Adam Koch
ae35154120
am f64fd772: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'f64fd772f4c36edfcf46bc2148a7208244ad4f31':
2013-03-05 13:02:52 -08:00
Dirk Dougherty
1b272cbd55
am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit 'f02ebca3c2660b61afee2a656ce52f410cd05646':
2013-03-05 13:02:50 -08:00
Dirk Dougherty
af749fece4
am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit '893f0cc179ca29d8a55eb36bd2108e428d33c406':
2013-03-05 13:02:46 -08:00
Andy McFadden
3e732435e7
Merge "Add eglPresentationTimeANDROID" into jb-mr2-dev
2013-03-05 20:59:47 +00:00
Daniel Sandler
56bea4d41b
Merge "Defend against NaNs in panel animation code." into jb-mr2-dev
2013-03-05 19:54:35 +00:00
Scott Main
13d0ce0a0e
am 0f8958d0: am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
...
* commit '0f8958d053467453fd99f62a40035115d347f662':
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 19:51:49 +00:00
Scott Main
0f8958d053
am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
...
* commit 'e3b8a46c4c37bf72086697c5add976297e329190':
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:49:21 -08:00
Joe Malin
f4634dcfe0
am d88cccc9: am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
...
* commit 'd88cccc9ba2051ec0523dbeb757680ffd59ec598':
Bug 8289268: Reversed text Content Provider Basics
2013-03-05 19:47:35 +00:00
Scott Main
e3b8a46c4c
am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
...
* commit 'f4c80adc04788c802c4a8df305d0ef8a1fe154b7':
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:47:32 -08:00
Joe Malin
d88cccc9ba
am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
...
* commit '72ee1820ceb5595087baca1c1205f5140197e0cb':
Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:45:51 -08:00
Scott Main
f4c80adc04
am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
...
* commit '48ff42cd1ca381b1de535bd74405649215bc7d01':
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:45:39 -08:00
Joe Malin
72ee1820ce
am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
...
* commit 'c17673712a8b199f0e30fd9fc920e9ff7d928dc9':
Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:44:11 -08:00
Scott Main
48ff42cd1c
am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
...
* commit '864e60fb26ddb7c48d0f0b9a0519e40b2fd528f0':
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:43:49 -08:00
Scott Main
c7c3befff6
am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
...
* commit '864e60fb26ddb7c48d0f0b9a0519e40b2fd528f0':
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
2013-03-05 11:43:02 -08:00
Joe Malin
c17673712a
am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
...
* commit 'ebdf1ccc5bd18e2f55d6f900382dabad4a287b9b':
Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:42:15 -08:00
Joe Malin
ebdf1ccc5b
am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
...
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:40:15 -08:00
Scott Main
864e60fb26
Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev
2013-03-05 19:39:38 +00:00
Joe Malin
91dad7e8a3
am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
...
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
Bug 8289268: Reversed text Content Provider Basics
2013-03-05 11:38:37 -08:00
Joe Malin
33a9f63c1c
Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev
2013-03-05 19:35:57 +00:00
Scott Main
6e140b6b86
cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f
...
dashboard update for 4/4/13
Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763
2013-03-05 11:35:49 -08:00
Romain Guy
b0d415a79a
Merge "Fix colored rects clipping and code cleanup" into jb-mr2-dev
2013-03-05 19:34:58 +00:00
Andy McFadden
0c361e9d3c
Add eglPresentationTimeANDROID
...
Added EGL extension to set a timestamp on a surface.
Bug 8191230
Change-Id: Ie73bd7d1217348c9c64b8c68da38d671d48355f7
2013-03-05 11:16:10 -08:00
Daniel Sandler
e7c5bbb171
Defend against NaNs in panel animation code.
...
Once these get into the Animators, they freeze up and
disable the whole notification panel. Not cool.
Bug: 7686690
Change-Id: I04567417b3840a82d9cfe071c601e3078b2e3fe3
2013-03-05 14:06:12 -05:00
Dianne Hackborn
ad4a174bbc
Merge "Fix build." into jb-mr2-dev
2013-03-05 18:29:08 +00:00
Dianne Hackborn
4ec6cc5108
Fix build.
...
Change-Id: Iaa70b05a3cfd372518ec35aa8bcea2f9d78b8292
2013-03-05 10:28:05 -08:00
Romain Guy
3b753829ae
Fix colored rects clipping and code cleanup
...
The drawColorRects() method was clipping individual rectangles
using the wrong parameters left, top, right and bottom instead
of l, r, t and b. It also checked for count == 0 after the loop
when it should have checked for vertexCount == 0. The quickReject
is now not part of the loop since it's a bit overkill to perform
so many matrix multiplications. What we really care about is the
final quickReject performed on the max bounds of the entire set
of rectangles.
This change also replaces all instances of mSnapshot->transform
by currentTransform() to make the code slightly more readable.
Change-Id: I6485280414499716852f7dbfba186774eb6763d4
2013-03-05 10:27:35 -08:00
Irfan Sheriff
c7ede61f59
Merge "Fix client tracking" into jb-mr2-dev
2013-03-05 18:13:59 +00:00
Irfan Sheriff
c808a1955f
Fix client tracking
...
Bug: 8311559
Change-Id: I167fcdd5c3da4d46b7d99e18041036023c8c60f7
2013-03-05 09:46:36 -08:00
Andy McFadden
43abdc486d
Merge "Implement Surface input to MediaCodec." into jb-mr2-dev
2013-03-05 17:39:29 +00:00
Dianne Hackborn
a55136169e
Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev
2013-03-05 17:37:43 +00:00
Dianne Hackborn
9c9aec721a
Merge "Fix issue #8311263 : Corrupted UI across all tabs in People app" into jb-mr2-dev
2013-03-05 17:34:40 +00:00
Dianne Hackborn
e3f23a36d8
Add new WindowId for cross-process monitoring of focus.
...
This is a class representing a window and providing limited
interaction with it, which can be handed across processes.
Change-Id: I22885f2064a9cc8c68d690a5858c2e28bbb6a0f3
2013-03-05 09:33:48 -08:00
Adam Koch
25a3b1ddeb
am cc3fec69: am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev
...
* commit 'cc3fec699d9fdf57a080106e6ca7b3ae845f1446':
Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
2013-03-05 14:38:30 +00:00