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

52229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
38c07129c4 Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h 
Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
 2011-06-03 12:44:48 -07:00
Dianne Hackborn
f3b57def93 resolved conflicts for merge of 7e193916 to master 
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
 2011-06-03 12:26:54 -07:00
Kazuhiro Ondo
76273dd16d am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting" 
* commit '77c9411306b6b3d210d22214d596272c9728cf5e':
  Data recovery failure due to apn/dc state stuck in "disconnecting"
 2011-06-03 12:19:23 -07:00
John Reck
816c0defc7 Initial support for view state serialization 
Framework for serializing the view state
 Still needs to prevent sending messages to webkit (pinch
 zoom doesn't work correctly as a result)

Change-Id: Ic3f8fe19b27ff1f841b556e87f582dab2a6d903b
 2011-06-03 11:47:56 -07:00
Kazuhiro Ondo
77c9411306 Data recovery failure due to apn/dc state stuck in "disconnecting" 
If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.

This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
   to ensure DC won't be stuck in DcDisconnectingState so force
   reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
   can be reset to IDLE even if no reference to DCAC.

Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
 2011-06-03 11:42:48 -07:00
Daniel Sandler
58f48edd21 am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'f5699b82adef34b0b6bd88554c6a017f8662985e':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:26:17 -07:00
Daniel Sandler
f5699b82ad am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'b4b44bd32983e154f2ad61b99809ed6cedd46d47':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:22:49 -07:00
Jeff Brown
201e6606e7 am f257c4b5: (-s ours) am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 
* commit 'f257c4b575ad1bda77decfc2ecb5df234762247e':
  Button state should reflect actual buttons. (DO NOT MERGE)
 2011-06-03 11:21:42 -07:00
Amith Yamasani
99ce8abc3f am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit '42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
  Use Holo background and proper padding for App Permissions UI.
 2011-06-03 11:11:22 -07:00
Daniel Sandler
b4b44bd329 DO NOT MERGE. Restore status bar on phones. 
Bug: 4529373
Change-Id: Ie08522dbf762e80ac077ce403ff83312cec907f7
 2011-06-03 11:11:10 -07:00
Stephen Hines
dad7fdedbc Merge "Improve validation in RS FieldPacker." 2011-06-03 10:41:08 -07:00
Gilles Debunne
955e8d79b1 am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 
* commit '00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
  Tap timeout removed on paste. Relying on position only.
 2011-06-03 10:35:58 -07:00
Andy Stadler
daac9dd974 am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit 'c22d145a9f26314e23ea678e96766755268e878b':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 10:33:13 -07:00
Gilles Debunne
00afa11c15 am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 
* commit '0538e6217de35e418c9779fd48c8300e65cc4f1e':
  Tap timeout removed on paste. Relying on position only.
 2011-06-03 10:32:00 -07:00
Andy Stadler
c22d145a9f am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 10:28:45 -07:00
Gilles Debunne
0538e6217d Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 2011-06-03 10:26:18 -07:00
Andy Stadler
3148557c42 Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 2011-06-03 10:24:27 -07:00
Eric Fischer
3124e6ebe7 Merge "Import revised translations." 2011-06-03 10:22:58 -07:00
Wink Saville
3699c3d7c8 am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 
* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
  Refactor ServiceStateTracker handling of radio technology.
 2011-06-03 10:21:07 -07:00
Wink Saville
5b4e24400a Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 2011-06-03 10:16:11 -07:00
Robert Greenwalt
352dbc44a4 Promote Telephony's isDataPossible. 
bug:3481357
Change-Id: I83cb40cd5bb86d98abbb7152190b2277470fa160
 2011-06-03 09:51:03 -07:00
Wink Saville
db09b5db60 Refactor ServiceStateTracker handling of radio technology. 
Also add a little more debugging.

Change-Id: I832872c876b290a3e83a79068059a21894472a1d
 2011-06-03 09:06:28 -07:00
Daniel Sandler
30a9ef5126 Merge "Restore status bar on phones." 2011-06-03 08:10:03 -07:00
Derek Sollenberger
df0d966d67 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Narayan Kamath
4b1b27a798 Merge "Language loading / availablity should repsect defaults enforcement." 2011-06-03 04:34:45 -07:00
satok
752737076d am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'e10de072d50cbe6984151cbbdba4dd2f2e8310b9':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:25:14 -07:00
satok
e10de072d5 am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:22:35 -07:00
satok
be96408b80 (Do not merge) Backport a fix for InputMethodManager.java 
Bug: 4517456

Original CL: Icec380f3ca05cf798cc4b82155d0cecf178633a5

Change-Id: I579fb1ee1b53d312f7cfc5c689d4500cb875352e
 2011-06-03 14:48:21 +09:00
Daniel Sandler
631cb3d591 Restore status bar on phones. 
Bug: 4529373
Change-Id: I669774e734cb5f40c8944ffb5161c3b4bf7b2996
 2011-06-03 01:27:06 -04:00
Mathias Agopian
b2450ce105 Merge "use quaternions instead of MRPs" 2011-06-02 21:13:13 -07:00
Mathias Agopian
6043e5329c use quaternions instead of MRPs 
also use correct time propagation equation
disable the fused sensors when gyro is not present since
they were unusable in practice.

Change-Id: Iad797425784e67dc6c5690e97c71c583418cc5b5
 2011-06-02 21:11:50 -07:00
satok
b1b2e2275f Merge "Update internal states stored in InputMethodManager properly" 2011-06-02 20:59:14 -07:00
Stephen Hines
e27832acc0 Improve validation in RS FieldPacker. 
Change-Id: I9f6a58048129db4978c893c2dc591b0ed825d05f
 2011-06-02 19:36:41 -07:00
Dianne Hackborn
d247ee41d6 am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit '758b67b12386a6ea52d520aef455c3150c9bae03':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:33:22 -07:00
Dianne Hackborn
758b67b123 am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:30:34 -07:00
Dianne Hackborn
b46ed7636b Add new Fragment API for explicitly saving/restoring state. 
Also fix issue #4519821:
Blank screen displayed on tapping "Battery Use" option in the settings

We weren't correctly doing the full Activity resume code when coming
back from delivering a new Intent or result.

And fix a fragment problem where we still weren't correctly restoring
the state of list views.  (I think this was from a bad manual-merge
from master.)

Change-Id: If79dc7e998155c39ab8c04781f6c73a82238a9ef
 2011-06-02 19:18:07 -07:00
Tadashi G. Takaoka
7e7248f2df am 6d1b8995: (-s ours) am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 
* commit '6d1b8995a6e10a3107fd585fc4bae8b2dde24196':
  Fix input type judgment of WebTextView (DO NOT MERGE)
 2011-06-02 19:07:20 -07:00
Conley Owens
e30277b091 am 1bbcc695: am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 
* commit '1bbcc6953ae692206052e62b6adae15e221ec356':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
 2011-06-02 18:53:25 -07:00
Xavier Ducrohet
0b423bd591 am 59e699f1: (-s ours) am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. 
* commit '59e699f13db9a32f30108e25577685bb39b3dae4':
  Merge 6103e22c from honeycomb-mr1. do not merge.
 2011-06-02 18:53:17 -07:00
Xavier Ducrohet
e73e77e5eb am 311f9493: (-s ours) am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. 
* commit '311f9493dfa88d455ff0ea25f86e508a6852682d':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
 2011-06-02 18:53:03 -07:00
Ed Heyl
31e61185a6 resolved conflicts for merge of 39ddeae0 to master 
Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
 2011-06-02 18:49:11 -07:00
Jeff Brown
60a126a4c8 Merge "Fix ABS_MT_SLOT handling." 2011-06-02 18:31:47 -07:00
Jeff Brown
441a9c28f5 Fix ABS_MT_SLOT handling. 
Shouldn't reset the current slot index to 0 after each SYN_REPORT.

Change-Id: I370e4770f8ae0ce598369ecbaf64772c13e02d46
 2011-06-02 18:29:10 -07:00
satok
501017eb8f Merge "resolved conflicts for merge of 7e2181c0 to master" 2011-06-02 18:28:58 -07:00
satok
3fc1f85a37 resolved conflicts for merge of 7e2181c0 to master 
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
 2011-06-03 10:26:15 +09:00
Wink Saville
147510145f am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
  CdmaLte: Use SPN from SIM card if SIM card is presend
 2011-06-02 18:24:28 -07:00
Wink Saville
ade2a5467c am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 
* commit '1076f5ff27d35a5a807043bdea49aa40404d9c6b':
  Read CSIM records in LTE on CDMA mode
 2011-06-02 18:24:20 -07:00
Jim Miller
0d780ae8ac Merge "Fix 4518876: Disable lock screen rotation on phones." 2011-06-02 18:22:54 -07:00
Wink Saville
2e543dc188 Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 2011-06-02 18:21:50 -07:00
Wink Saville
1076f5ff27 Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 2011-06-02 18:21:37 -07:00