47208 Commits

Author SHA1 Message Date
Michael Jurka
e3f075622d Merge "Removing TextView predraw listeners sooner" 2011-03-14 14:23:47 -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
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
Wink Saville
4f63104bfe 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
bfc281b47f 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
5a9a853a2f 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
ea93d815ac 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
ebcdd0ab96 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
b4153830b3 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
285a820496 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
f654c8f6b0 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
e6cf4fcb53 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
a9614308e1 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
284d6b627c 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
2fc175f9d7 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
Wink Saville
cd2294fb5b 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
d3f4b40c4b 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
5b79d003e8 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
c8da3ddf3d 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
6207b8ca2d 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
e1a500777d 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
d9ca063d92 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
Ramesh Sudini
e62dee25e5 Do not merge: Telephony: Rename lte_on_cdma property.
Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
2011-03-14 13:44:30 -07:00
Ramesh Sudini
f57276154a Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
2011-03-14 13:44:30 -07:00
Wink Saville
f90c260904 Do not merge: Add outputting "on" or "off" setRadioPower.
Change-Id: I0865f17e63f4b9867a8d33e7e147613010683a27
2011-03-14 13:44:30 -07:00
Ramesh Sudini
c06c5c1a13 Do not merge: Telephony: Fix config to reflect the correct CM conn type.
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
2011-03-14 13:44:30 -07:00
Wink Saville
124e28728b Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
Change-Id: I131c8323737b0b5122a5087c77d8c6102d74b138
2011-03-14 13:44:30 -07:00
Wink Saville
321b730a9d Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
DataConnection now wraps its retry manager instead of exporting it.

Change-Id: Ibda6a235430b8ec51d1518c2956de71f964e3f39
2011-03-14 13:44:30 -07:00
Gilles Debunne
467016e88a 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
d6398ad3ce Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE 2011-03-14 13:43:05 -07:00
Wink Saville
d794596705 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
08d79acc46 Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 2011-03-14 13:42:49 -07:00
Wink Saville
7fbae1d23c 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
16b7f051f7 Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 2011-03-14 13:42:07 -07:00
Wink Saville
9e22c33c2b Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 2011-03-14 13:41:42 -07:00
Wink Saville
c3853f3664 Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00
Gilles Debunne
7069f7c0e7 am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
* commit '816dd3d443108b473965f97123eef7300f53615f':
  Double tap on a word no longer opens context menu. DO NOT MERGE
2011-03-14 13:41:14 -07:00
Wink Saville
c15cf6353e Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Michael Jurka
2b942d5329 Removing TextView predraw listeners sooner
Solves issue where the listeners were being run on every frame
2011-03-14 13:31:03 -07:00
Gilles Debunne
816dd3d443 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
2011-03-14 12:57:01 -07:00
Wink Saville
9d7d5b4435 Do not merge: Fix 3G connectivity bug 3513741.
ServiceStateTracker the registerForDataConnectionDetached needed to
test for !STATE_IN_SERVICE so that the other values for state also cause
the detached notifciation.

CdmaServiceStateTracker needed to use the ServiceStateTracker lists
and not the cdma specific lists for registration, which are now deleted.
Also removed an unused import.

CdmaLteServiceStateTracker cannot use the deleted cdma specific
registration lists.

Bug: 3513741
Change-Id: I0939a47251ffc70ea5c9e4675a4b4179d9c718b1
2011-03-14 12:39:02 -07:00
Ramesh Sudini
df6542d5ca Do not merge: RIL: Merge Issue. LTE SIM additions.
Change-Id: Ide70b523d376e1c3f2979051c083365346bf41f6
2011-03-14 12:39:02 -07:00
Ramesh Sudini
074f83515f Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Bug: 3479209
Change-Id: I08b30c4868a12342221b6428eca8ffbb08f2b22a
2011-03-14 12:39:01 -07:00
Ramesh Sudini
75acebd02d Do not merge: LTE: Fix SST for CDMALTEPhone.
Change-Id: I4dc3d3bb4dba968694a5856624448b7ba1e35601
2011-03-14 12:38:56 -07:00