Jamie Gennis
fee6d64833
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
520eb2f5b5
Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
2011-03-14 15:24:20 -07:00
Jamie Gennis
22943e256e
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
5c8257a855
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
f8a473e8de
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
16c51acc59
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
ad86182a9d
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
3d27e84cdd
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
29632a4deb
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
7bf0e75a4c
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
8d391b321c
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
93a2b0ee6e
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
b041f67843
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
0cd6caf7a7
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
36e250659a
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
6ecd555801
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
a5b7360b4f
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
65a937994c
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
Eric Fischer
e901940f02
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
b65dc30d05
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
efc7d6eb88
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
7cd6cf9ea5
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
98f2f33fe5
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
a330ca6cd0
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
712a7fb381
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
Eric Fischer
40655edecd
am e0b33ce0: Add "new incognito window" translations.
...
* commit 'e0b33ce0c3ebdb7aa73af5350bb5bdcd26f59370':
Add "new incognito window" translations.
2011-03-14 15:14:22 -07:00
Nicolas Roard
c9eb44612b
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
Scott Main
93e683b4e4
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
5486e6dcb7
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
48456a6bf3
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
d1204459c8
am aa3ea7be: Add "new incognito window" translations.
...
* commit 'aa3ea7be0c78e8aa5f3a32b0decba03edba00686':
Add "new incognito window" translations.
2011-03-14 14:58:39 -07:00
Jamie Gennis
1a4efdc224
Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
2011-03-14 14:49:37 -07:00
Huahui Wu
48e7f35d10
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
b8847d1bbb
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
2011-03-14 14:46:26 -07:00
Huahui Wu
b9ab7f5478
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
ed8d7e66ba
Merge "libstagefright: Add error handling in AMRNB deooder"
2011-03-14 14:43:24 -07:00
Scott Main
3758c1b419
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
605afd89e3
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
529031662f
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
7175cacc8c
am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '175121a513f4cea91d7950d6b3978383d3b2a352':
Import revised translations. DO NOT MERGE
2011-03-14 14:29:05 -07:00
Eric Fischer
8cf7363ba7
am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1
...
* commit '9f70f5268fac9c2dd5ed4cb9582da5931c846a91':
Add "new incognito window" translations.
2011-03-14 14:28:58 -07:00
Iliyan Malchev
9dde9efd0b
frameworks/base: remove LOCAL_PRELINK_MODULE
...
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:25:59 -07:00
Michael Jurka
94eef31e8f
Merge "Removing TextView predraw listeners sooner"
2011-03-14 14:23:47 -07:00
Eric Fischer
b066ddc849
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-14 14:17:01 -07:00
Eric Fischer
230de7bfc0
Merge "Add "new incognito window" translations." into honeycomb-mr1
2011-03-14 14:13:29 -07:00
Jeff Brown
67a79e1800
Merge "Use touch pad gestures to manipulate the pointer."
2011-03-14 14:12:51 -07:00
Jeff Brown
fa773aa745
Use touch pad gestures to manipulate the pointer.
...
1. Single finger tap performs a click.
2. Single finger movement moves the pointer (hovers).
3. Button press plus movement performs click or drag.
While dragging, the pointer follows the finger that is moving
fastest. This is important if there are additional fingers
down on the touch pad for the purpose of applying force
to an integrated button underneath.
4. Two fingers near each other moving in the same direction
are coalesced as a swipe gesture under the pointer.
5. Two or more fingers moving in arbitrary directions are
transformed into touches in the vicinity of the pointer.
This makes scale/zoom and rotate gestures possible.
Added a native VelocityTracker implementation to enable intelligent
switching of the active pointer during drags.
Change-Id: I5ada57e7f2bdb9b0a791843eb354a8c706b365dc
2011-03-14 14:12:03 -07:00
Ramesh Sudini
bf62cf5e7c
am 956a9bd5: (-s ours) am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property.
...
* commit '956a9bd501707afab59eac97f37e7b0194c868ac':
Do not merge: Telephony: Rename lte_on_cdma property.
2011-03-14 13:52:53 -07:00
Ramesh Sudini
acd5de1b85
am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property.
...
* commit 'e62dee25e50c04c235cd37df66e4ef123b761663':
Do not merge: Telephony: Rename lte_on_cdma property.
2011-03-14 13:49:36 -07:00
Ramesh Sudini
9fe16d5af1
am bfc281b4: (-s ours) am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
...
* commit 'bfc281b47f714d20382d7ee0325d34b0c217d7b3':
Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
2011-03-14 13:49:25 -07:00