drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,232 Commits 1 Branch 0 Tags
Commit Graph

47232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Michael Jurka
e3f075622d Merge "Removing TextView predraw listeners sooner" 2011-03-14 14:23:47 -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
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