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
Wink Saville
5b93835d7d
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
a49848ce58
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
b45f4131b7
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
Wink Saville
cdc745d6a9
am b4153830: (-s ours) am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
...
* commit 'b4153830b3141572f0b84df5c826ab7d70c30e18':
Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
2011-03-14 13:49:15 -07:00
Ramesh Sudini
fe974fc806
am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
...
* commit 'f57276154aaa587524374db8e0d7228383611bf3':
Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
2011-03-14 13:47:48 -07:00
Wink Saville
95315a5c8a
am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower.
...
* commit 'f90c26090402a517aa68cade7f452bc1ad85e654':
Do not merge: Add outputting "on" or "off" setRadioPower.
2011-03-14 13:47:44 -07:00
Ramesh Sudini
0eca33c915
am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.
...
* commit 'c06c5c1a13da26c8435f2d4b72a41a38e1d463b8':
Do not merge: Telephony: Fix config to reflect the correct CM conn type.
2011-03-14 13:47:42 -07:00
Wink Saville
732e0d2e17
am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
...
* commit '124e28728b16cb63c700a323b9dfb1348580c896':
Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
2011-03-14 13:47:39 -07:00
Wink Saville
654e381e67
am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
...
* commit '321b730a9d34b237c26075d963c8febf8d62eff1':
Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
2011-03-14 13:47:36 -07:00
Wink Saville
1ccf12002e
am d3f4b40c: (-s ours) am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE
...
* commit 'd3f4b40c4bde88b524fbe35a35da80de66e23d50':
Do not merge: Fix 3G connectivity bug 3513741.
2011-03-14 13:47:25 -07:00
Wink Saville
5205d7d509
am 5b79d003: (-s ours) am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
...
* commit '5b79d003e8324fef5c0caf6a11e446896728e0e6':
Do not merge: RIL: Merge Issue. LTE SIM additions.
2011-03-14 13:47:23 -07:00
Wink Saville
5f88dce53d
am c8da3ddf: (-s ours) am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
...
* commit 'c8da3ddf3df453f57773d5f0b1bd1be68760d611':
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
2011-03-14 13:47:20 -07:00
Wink Saville
ab18472b16
am 6207b8ca: (-s ours) am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
...
* commit '6207b8ca2df1c0addd27f3908d3d2f65e0e3851b':
Do not merge: LTE: Fix SST for CDMALTEPhone.
2011-03-14 13:47:18 -07:00
Wink Saville
6a76fc3dc9
am e1a50077: (-s ours) am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
...
* commit 'e1a500777d2c7e2211e6a41f69e63d1b61ec97af':
Do not merge: Clean up LTE code change
2011-03-14 13:47:15 -07:00
Wink Saville
80e033e5d7
am d9ca063d: (-s ours) am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
...
* commit 'd9ca063d92b2ff980fa0e0e14955f837fcf75946':
Do not merge: Add some input checking to prevent problems
2011-03-14 13:47:12 -07:00
Ying Wang
a68f3ad15a
am bf079216: Dist classes.jar with full class files inside
...
* commit 'bf079216c607b660a0ad219df6c4752906a7fc61':
Dist classes.jar with full class files inside
2011-03-14 13:45:34 -07:00
Wink Saville
7fb6e14931
am d7945967: (-s ours) am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
...
* commit 'd79459670576da8aafc831ac0872f550d4137164':
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-14 13:45:19 -07:00
Wink Saville
adf53bf027
am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE
...
* commit 'd6398ad3ce962a6345d18b166ae8484a4259f6f2':
Do not merge: Fix 3G connectivity bug 3513741.
2011-03-14 13:44:50 -07:00
Wink Saville
9460cac2ff
am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
...
* commit '08d79acc462a395a6fb6d0b126eb4d97466962c7':
Do not merge: RIL: Merge Issue. LTE SIM additions.
2011-03-14 13:44:48 -07:00
Wink Saville
8ce508231f
am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
...
* commit '7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
2011-03-14 13:44:45 -07:00
Wink Saville
536c9e41b1
am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
...
* commit '16b7f051f71e276f4dd45455e92c33a0894bab10':
Do not merge: LTE: Fix SST for CDMALTEPhone.
2011-03-14 13:44:43 -07:00
Wink Saville
ea1b0c6b66
am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
...
* commit '9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
Do not merge: Clean up LTE code change
2011-03-14 13:44:40 -07:00
Wink Saville
4deedeb0e7
am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
...
* commit 'c3853f36645f2f4f4801d6465e82095cf38ea043':
Do not merge: Add some input checking to prevent problems
2011-03-14 13:44:37 -07:00
Gilles Debunne
e375b82688
am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
...
* commit '7069f7c0e78bf01bf83a5c14025525b8604f16b9':
Double tap on a word no longer opens context menu. DO NOT MERGE
2011-03-14 13:43:30 -07:00
Wink Saville
846d2b4f27
Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE
2011-03-14 13:43:05 -07:00
Wink Saville
35f9c49542
am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
...
* commit 'c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-14 13:42:50 -07:00
Wink Saville
456b90a3a6
Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE
2011-03-14 13:42:49 -07:00
Wink Saville
fc2aa886fe
Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE
2011-03-14 13:42:24 -07:00
Wink Saville
1ad816a48f
Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE
2011-03-14 13:42:07 -07:00
Wink Saville
b979cc999b
Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE
2011-03-14 13:41:42 -07:00