47444 Commits

Author SHA1 Message Date
Huahui Wu
6306585107 am e7c4b7a7: am cc8fa160: b/3392594 keep the remain touch points when one is ended.
* commit 'e7c4b7a7d1bf2169250bbc3f0aaa52a464fd8218':
  b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:25:07 -07:00
Nicolas Roard
21f86159ff am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
* commit 'b6866f81a945d57390542526b154edae01ee795e':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:24:57 -07:00
Renaud-Roland Hubert
04da3dc67e am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '58162eba33c287d747ceb4753abf6c3ba4223466':
2011-03-14 15:24:54 -07:00
Jamie Gennis
ef1d5f3e5e am 21752785: gl2_yuvtex: use the gralloc-provided stride.
* commit '21752785bae7c1beaf5729e43973bed6b9e14520':
  gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:24:51 -07:00
Xavier Ducrohet
491ef0c6bd Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 2011-03-14 15:24:20 -07:00
Jamie Gennis
dcbc255734 am c313b59b: am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
* commit 'c313b59b4295c7cfe7f13d635be2c85f9fee7365':
  gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:22:34 -07:00
James Wilson
46a3642251 am 5efa65d1: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '5efa65d1948c3396d4f68a64c9fe4788a4ab0d62':
2011-03-14 15:22:31 -07:00
Huahui Wu
e7c4b7a7d1 am cc8fa160: b/3392594 keep the remain touch points when one is ended.
* commit 'cc8fa160fbfcd17f369c15a2d33959fbb090ac6e':
  b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:22:29 -07:00
Huahui Wu
a492e1a14b am ddba200b: am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
* commit 'ddba200b425c56b3b66ead23e8d5fd51a17c6cc4':
  b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:22:12 -07:00
Huahui Wu
f3f1a85c63 am 21e30abf: am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '21e30abf68554bee9cb143e17f3919432b6eb0c9':
2011-03-14 15:22:08 -07:00
Eric Fischer
909a4c2fbe am a3ef0bb7: (-s ours) am d5e8dae8: Import revised translations. DO NOT MERGE
* commit 'a3ef0bb7af48525ad8c0064185ba0019298b0675':
  Import revised translations.  DO NOT MERGE
2011-03-14 15:22:06 -07:00
Scott Main
c0c43ce0d7 am c710cf37: am c899d32e: docs: update search dev guide with SearcView widget
* commit 'c710cf379f61c767d372104a3c9d6142d54aa02f':
  docs: update search dev guide with SearcView widget
2011-03-14 15:22:03 -07:00
Eric Fischer
a107883d62 am 6617e1fc: am e0b33ce0: Add "new incognito window" translations.
* commit '6617e1fcb4ffbec4f339e0d6c727643b0c2da1d7':
  Add "new incognito window" translations.
2011-03-14 15:22:00 -07:00
Nicolas Roard
b6866f81a9 am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:21:46 -07:00
Renaud-Roland Hubert
58162eba33 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 15:21:44 -07:00
Jamie Gennis
21752785ba gl2_yuvtex: use the gralloc-provided stride.
This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.

Bug: 4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c
2011-03-14 15:21:37 -07:00
Jamie Gennis
c313b59b42 am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
* commit '071929b202404da110c17fad4aba216558e7e785':
  gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:19:31 -07:00
James Wilson
5efa65d194 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 15:19:30 -07:00
Scott Main
a51a6beeed am 9e173ece: am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget
* commit '9e173ececf985c1dcd32e3cc2627499919fc329b':
  docs: update search dev guide with SearcView widget
2011-03-14 15:19:21 -07:00
Eric Fischer
45b85bf494 am f6c3b32b: am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit 'f6c3b32b5cfcfda257d5825078433d89be80d934':
2011-03-14 15:19:18 -07:00
Eric Fischer
0fd4a8a5de am 7e315466: (-s ours) am 9f7b4ba6: Import revised translations. DO NOT MERGE
* commit '7e315466672b34dab1a85301f4870ddae044a9f3':
  Import revised translations.  DO NOT MERGE
2011-03-14 15:19:15 -07:00
Huahui Wu
cc8fa160fb b/3392594 keep the remain touch points when one is ended.
This is the Java side code change for b/3392594.
It adds an action index into the touch event data and pass it
to the native side.

Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
2011-03-14 15:19:13 -07:00
Eric Fischer
65baaeb22d am 86fe201b: am aa3ea7be: Add "new incognito window" translations.
* commit '86fe201baf2164ba981b8932e5c08303c84be2c9':
  Add "new incognito window" translations.
2011-03-14 15:19:10 -07:00
Eric Fischer
3d44d7c15c am 9ce4370f: (-s ours) am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '9ce4370f39c909324be160464711fedaa0c75606':
  Import revised translations.  DO NOT MERGE
2011-03-14 15:19:00 -07:00
Eric Fischer
2d59a94716 am 29f10747: am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1
* commit '29f107476d577e073748c29a9e31c573620684be':
  Add "new incognito window" translations.
2011-03-14 15:18:52 -07:00
Huahui Wu
ddba200b42 am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
* commit '9691d3f3181e514471383e170684b27330cb5dbb':
  b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:15:16 -07:00
Huahui Wu
21e30abf68 am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit 'f2a9e576d4fb5d028d1acf7344d611c91bb40999':
2011-03-14 15:15:04 -07:00
Eric Fischer
a3ef0bb7af am d5e8dae8: Import revised translations. DO NOT MERGE
* commit 'd5e8dae883f8343e7adfb1f4388d742002e5eb8e':
  Import revised translations.  DO NOT MERGE
2011-03-14 15:14:59 -07:00
Scott Main
c710cf379f am c899d32e: docs: update search dev guide with SearcView widget
* commit 'c899d32e8be988b46c37206827a0a1a7a4b809a6':
  docs: update search dev guide with SearcView widget
2011-03-14 15:14:36 -07:00
Nicolas Roard
3efaa34015 Adding placeholders for the large play button
used by the browser for HTML5 video (the button will appear
surimposed to the video)

bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
2011-03-14 15:14:28 -07:00
Eric Fischer
6617e1fcb4 am e0b33ce0: Add "new incognito window" translations.
* commit 'e0b33ce0c3ebdb7aa73af5350bb5bdcd26f59370':
  Add "new incognito window" translations.
2011-03-14 15:14:22 -07:00
Xavier Ducrohet
9d76581faf LayoutLib: Fix Arc rendering.
Looks like Java2D and Skia go in different directions for angles.

Change-Id: Ia0c9c70cd66c9a0941fa9921fecf8e4e83538af3
2011-03-14 15:12:21 -07:00
Nicolas Roard
0fd8fa33e2 Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 2011-03-14 15:11:55 -07:00
Shailendra Yadav
4d0ec22aa9 Fix for Don't allow adding 64-bit files(4086708)
Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
2011-03-14 15:07:05 -07:00
Scott Main
9e173ececf am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget
* commit '2213a4aca030151f6590a998200daa9865202343':
  docs: update search dev guide with SearcView widget
2011-03-14 14:59:11 -07:00
Eric Fischer
f6c3b32b5c am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '951763824168d08d3f54ba22917756d769486b8b':
2011-03-14 14:58:50 -07:00
Eric Fischer
7e31546667 am 9f7b4ba6: Import revised translations. DO NOT MERGE
* commit '9f7b4ba69ca809d6909b8863d3570f970edcb7bf':
  Import revised translations.  DO NOT MERGE
2011-03-14 14:58:45 -07:00
Eric Fischer
86fe201baf am aa3ea7be: Add "new incognito window" translations.
* commit 'aa3ea7be0c78e8aa5f3a32b0decba03edba00686':
  Add "new incognito window" translations.
2011-03-14 14:58:39 -07:00
Jamie Gennis
071929b202 Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 2011-03-14 14:49:37 -07:00
Huahui Wu
9691d3f318 am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
  b/3392594 keep the remain touch points when one is ended.
2011-03-14 14:46:27 -07:00
Huahui Wu
f2a9e576d4 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:46:26 -07:00
Eric Fischer
d5e8dae883 Import revised translations. DO NOT MERGE
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:44:41 -07:00
Scott Main
c899d32e8b docs: update search dev guide with SearcView widget
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
2011-03-14 14:44:41 -07:00
Eric Fischer
e0b33ce0c3 Add "new incognito window" translations.
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
2011-03-14 14:44:40 -07:00
Huahui Wu
b71020ef40 Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 2011-03-14 14:43:46 -07:00
James Dong
f20dcbcba9 Merge "libstagefright: Add error handling in AMRNB deooder" 2011-03-14 14:43:24 -07:00
Scott Main
2213a4aca0 am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget
* commit '462012db70fb73431bb25909d73e45fea9fc5911':
  docs: update search dev guide with SearcView widget
2011-03-14 14:42:51 -07:00
Eric Fischer
9517638241 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:42:50 -07:00
Scott Main
462012db70 am abdf0d53: docs: update search dev guide with SearcView widget
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
  docs: update search dev guide with SearcView widget
2011-03-14 14:36:56 -07:00
Eric Fischer
9f7b4ba69c Import revised translations. DO NOT MERGE
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:31:58 -07:00