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

47178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Ying Wang
e422f7a21a 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
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
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
Mike Lockwood
ccdac700df am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
 2011-03-14 13:37:54 -07:00
Ying Wang
bf079216c6 Dist classes.jar with full class files inside 
Instead of the final jar with classes.dex inside.

Change-Id: I2bc7eb6faedf328a93a6e2eacc4334d87761f597
 2011-03-14 13:35:59 -07:00
Simon Wilson
81e1ed7eb5 am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
  DO NOT MERGE Support WiMAX Settings & ticker message
 2011-03-14 13:34:18 -07:00
Daniel Sandler
9bbaa1564b am 45660662: Merge "Workaround unknown ERI indices." into gingerbread 
* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
  Workaround unknown ERI indices.
 2011-03-14 13:34:08 -07:00
Scott Main
abdf0d533c docs: update search dev guide with SearcView widget 
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
 2011-03-14 13:27:53 -07:00
Huahui Wu
2d3ef37ae6 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 13:21:23 -07:00
Mike Lockwood
78b8e1be97 Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 2011-03-14 13:17:24 -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