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
Amith Yamasani
7341727e8e
Use more padding on the sides for SearchView
...
Bug: 4088716
Change-Id: I2e49a38939c13a5fa57333dc745a82fdf3ead8f8
2011-03-14 14:54:04 -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
Eric Fischer
aa3ea7be0c
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:31:42 -07:00
Eric Fischer
9ce4370f39
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
29f107476d
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
3070af0882
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
Dianne Hackborn
cf3004a46e
Add some debug code to try to track down issue 3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
2011-03-14 14:24:04 -07:00
Michael Jurka
e3f075622d
Merge "Removing TextView predraw listeners sooner"
2011-03-14 14:23:47 -07:00
Justin Ho
5e6b4b0392
Updated textfield search assets
...
Bug: 3321263
Change-Id: I3e453f5d969cc94b11ec51a3807bc74948473833
2011-03-14 14:19:17 -07:00
Eric Fischer
175121a513
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-14 14:17:01 -07:00
Eric Fischer
9f70f5268f
Merge "Add "new incognito window" translations." into honeycomb-mr1
2011-03-14 14:13:29 -07:00
Jeff Brown
4cf3bd29ab
Merge "Use touch pad gestures to manipulate the pointer."
2011-03-14 14:12:51 -07:00
Jeff Brown
ace13b1786
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
Eric Fischer
7b31d5c84f
Import revised translations. DO NOT MERGE
...
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:06:03 -07:00
Nicolas Roard
5ee534cf88
Adding placeholders for the fullscreen button
...
used by the browser for HTML5 video
bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
2011-03-14 13:59:04 -07:00
Ramesh Sudini
43d47690e4
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
956a9bd501
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
9394a0f62f
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
Wink Saville
b1da540e18
am 5a9a853a: (-s ours) am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower.
...
* commit '5a9a853a2fe126b770e46edac7a294a9e1ba23d0':
Do not merge: Add outputting "on" or "off" setRadioPower.
2011-03-14 13:49:23 -07:00
Ramesh Sudini
2add818b07
am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.
...
* commit 'ea93d815ac33bf8ef0896b25fbf0185e6d6e82aa':
Do not merge: Telephony: Fix config to reflect the correct CM conn type.
2011-03-14 13:49:21 -07:00
Wink Saville
26887bd1aa
am ebcdd0ab: (-s ours) am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
...
* commit 'ebcdd0ab96e06c9898ab1e9f0b53a8f3ec72521b':
Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
2011-03-14 13:49:18 -07:00