Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,970 Commits 3 Branches 0 Tags
af033caf26ef4eca99c4024e59def7e42c3fa4cd
Commit Graph

51970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
af033caf26 Fix USE_TEXT_LAYOUT_CACHE define 
- fix compilation issues

Change-Id: I3358457d94d2278804e81e4ca96c9633ed76a147
 2011-06-06 11:51:46 -07:00
satok
04a5a95450 am 75273707: (-s ours) am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit '752737076dd0424998b8399e82af00bf745ba22f':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-03 16:22:04 -07:00
Dianne Hackborn
3c43ced841 resolved conflicts for merge of d247ee41 to master 
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
 2011-06-03 16:16:55 -07:00
Wink Saville
ed1a9022a1 am 14751014: am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 
* commit '147510145f7b619f86a71065f2d62f444aee7f3d':
  CdmaLte: Use SPN from SIM card if SIM card is presend
 2011-06-03 15:55:25 -07:00
Wink Saville
3144ca294b am ade2a546: am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 
* commit 'ade2a5467c8f6fbb115df6a1e5730758db4e620c':
  Read CSIM records in LTE on CDMA mode
 2011-06-03 15:55:20 -07:00
Jeff Brown
ccfcf3ba6c Merge "resolved conflicts for merge of ca2b552d to master" 2011-06-03 15:51:56 -07:00
Jeff Brown
7218d830e2 resolved conflicts for merge of ca2b552d to master 
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
 2011-06-03 15:50:27 -07:00
John Reck
5944b6a42b Merge "Prevent WebKit updates in loadViewState case" 2011-06-03 15:46:35 -07:00
John Reck
95b7d6f9c2 Prevent WebKit updates in loadViewState case 
Change-Id: I466f10c308b43f8683e537620e1c3e922a2cd465
 2011-06-03 15:36:25 -07:00
Jeff Brown
a742f85490 am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2 
* commit '56503b8ddfe5c82407da32e18061e725f668432d':
  Implement pointer acceleration.
 2011-06-03 15:30:33 -07:00
Scott Main
bb718776a1 am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2 
* commit 'b9040e774920c4641c154df2a358100cf78a2bd3':
  cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
 2011-06-03 15:29:17 -07:00
Scott Main
a0ee44df43 am 59a3ad16: am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2 
* commit '59a3ad16f57d23eb692b29bf7822dd5011dd7cc5':
  cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
 2011-06-03 15:29:01 -07:00
Scott Main
e981ee73a3 am 7c8b81c5: am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 
* commit '7c8b81c53674ffbd3fc0cdf29f5fff4548fda085':
  Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
 2011-06-03 15:28:44 -07:00
Dianne Hackborn
9468634987 Merge "resolved conflicts for merge of cc20b4e3 to master" 2011-06-03 15:24:20 -07:00
John Reck
5e02e09565 Merge "Initial support for view state serialization" 2011-06-03 15:21:16 -07:00
Dianne Hackborn
ead40eaedb resolved conflicts for merge of cc20b4e3 to master 
Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4
 2011-06-03 15:01:49 -07:00
Scott Main
e91a45a6cf am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2 
* commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f':
  doc typo
 2011-06-03 14:43:31 -07:00
Dianne Hackborn
2515db74fe am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug. 
* commit '3a80c50485809fe72d6de83dacad494c5e84ed24':
  Work around OpenFeint bug.
 2011-06-03 14:43:18 -07:00
Fabrice Di Meglio
ce08f78560 Merge "Fix default TextView gravity" 2011-06-03 14:37:23 -07:00
Fabrice Di Meglio
ea28694aee Fix default TextView gravity 
- default set to Gravity.TOP | Gravity.BEFORE instead of Gravity.TOP | Gravity.LEFT

Change-Id: I5e528fb1d0a6e3c84dd506e899df33c9b58d25f3
 2011-06-03 14:29:45 -07:00
Adam Powell
b93ffdb5d5 am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 
* commit 'b30dda6b550fedcf5c3b15671d483205a7757e1b':
  Framework: bugfix for menu selector not showing up properly.
 2011-06-03 14:28:26 -07:00
Dianne Hackborn
9f2f3752ae am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 
* commit 'c11f6c3e33c9f1e3964cb2427f82509fc97e3527':
  Compatibility mode never needed for normal size screens.
 2011-06-03 14:28:18 -07:00
Dianne Hackborn
678d344bcb resolved conflicts for merge of b9e2f68b to master 
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
 2011-06-03 14:15:10 -07:00
Adam Powell
3c784fe6a0 am d19fbe34: am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit 'd19fbe34e33fa79121e2822d0063f3aec350b3e5':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-03 14:03:20 -07:00
Scott Main
3f27392b42 am 1dd5fba9: (-s ours) am 2b876a31: am f5992953: docs: fix typos 
* commit '1dd5fba94927119133dd56d41714c1a5f3b82611':
  docs: fix typos
 2011-06-03 14:03:12 -07:00
Robert Greenwalt
c5e626c393 am 903cd57f: am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 
* commit '903cd57f67fee8708cc6349ca1aac4de01831798':
  Remove redundent getCurrentCdmaDataConnectionState
 2011-06-03 13:58:47 -07:00
Philip Milne
160cbbb9ac Merge "Response to code review for GridLayout:" 2011-06-03 13:46:34 -07:00
Jim Miller
33f27e2c83 Merge "Fix 4368649: Fix visible password issue on password unlock screen" 2011-06-03 13:32:34 -07:00
Jim Miller
5a1ff22f20 Fix 4368649: Fix visible password issue on password unlock screen 
Change-Id: I9ec30898e27d49d82d11dfcf3abb4273e4277316
 2011-06-03 13:30:41 -07:00
Philip Milne
aa616f31fe Response to code review for GridLayout: 
. Fixed spelling.
. Added comments on internal methods.
. Adopted the suggested internal name changes to improve clarity.
. Added UNDEFINED constant to public API to avoid making reference to Integer.MAX_VALUE in docs.
. Added final everywhere, then removed it.
. Make the Interval class package private so that it can be put somewhere more general later.
. Tidy code, removing maximize flag throughout.
. Remove last of allocations taking place during layout.
. Implement measureChild() etc.
. Added LinearLayout alignment compatibility mode, and made it the default.

Change-Id: I6a4ffa022d97d68138d1903d3830a20278815435
https://android-git.corp.google.com/g/#change,109891
 2011-06-03 13:22:52 -07:00
Dianne Hackborn
455591b913 am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'c691d7f9a3621d5ef9b9d48e95c644a318b36322':
  Forgot this file.
 2011-06-03 13:17:45 -07:00
Dianne Hackborn
50469db071 am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit '7322e557cfe42da42779625d69ced2db74a9df90':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-06-03 13:17:00 -07:00
Joe Malin
8c56154d9a am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit '409db558b3f47ac28f1291d82bef15a07b2920c3':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-06-03 13:16:29 -07:00
Dianne Hackborn
f3b57def93 resolved conflicts for merge of 7e193916 to master 
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
 2011-06-03 12:26:54 -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
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
Stephen Hines
dad7fdedbc Merge "Improve validation in RS FieldPacker." 2011-06-03 10:41:08 -07:00
Eric Fischer
3124e6ebe7 Merge "Import revised translations." 2011-06-03 10:22:58 -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