Commit Graph

35290 Commits

Author SHA1 Message Date
Fabrice Di Meglio
469095ade8 Merge "Fix default TextView gravity" 2011-06-03 14:37:23 -07:00
Adam Powell
4df6fa435e 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
1a4db9cb31 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
491e7b4bdf resolved conflicts for merge of b9e2f68b to master
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
2011-06-03 14:15:10 -07:00
John Wang
bff2a70a92 am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
* commit '3b71239aca01fb029d9acd2c606b7be9b8f32d66':
  Add supplyPuk to do SIM puk unlock.
2011-06-03 14:09:13 -07:00
Adam Powell
5719bdf635 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
58f8c28076 am 1dd5fba9: (-s ours) am 2b876a31: am f5992953: docs: fix typos
* commit '1dd5fba94927119133dd56d41714c1a5f3b82611':
  docs: fix typos
2011-06-03 14:03:12 -07:00
John Wang
34fef438ce Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 2011-06-03 14:01:59 -07:00
Robert Greenwalt
f23f35399c 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
c440d93f4d Merge "Response to code review for GridLayout:" 2011-06-03 13:46:34 -07:00
Jim Miller
942d9ce724 Merge "Fix 4368649: Fix visible password issue on password unlock screen" 2011-06-03 13:32:34 -07:00
Dianne Hackborn
cd3471ab08 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
fda22a1f87 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
5f8f246b90 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
6251456d6a resolved conflicts for merge of 7e193916 to master
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
2011-06-03 12:26:54 -07:00
Kazuhiro Ondo
02d3ec8112 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
Daniel Sandler
5dbf6527c4 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
aac874a461 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
6ae6526121 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
0c18be5a19 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
b917c18c28 Merge "Improve validation in RS FieldPacker." 2011-06-03 10:41:08 -07:00
Gilles Debunne
3208f76592 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
7ac3f736f4 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
9467440179 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
d163899fa6 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
b8c3181422 Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 2011-06-03 10:26:18 -07:00
Andy Stadler
4d68ae93e2 Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 2011-06-03 10:24:27 -07:00
Eric Fischer
e9360e9e46 Merge "Import revised translations." 2011-06-03 10:22:58 -07:00
Wink Saville
e73d276f8b 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
ffc24f1b5b Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 2011-06-03 10:16:11 -07:00
Daniel Sandler
a407c07ca5 Merge "Restore status bar on phones." 2011-06-03 08:10:03 -07:00
Derek Sollenberger
75b13fb030 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Narayan Kamath
4743494987 Merge "Language loading / availablity should repsect defaults enforcement." 2011-06-03 04:34:45 -07:00
satok
d01595f61b 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
63dc0677ec 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
Mathias Agopian
63e7310bec Merge "use quaternions instead of MRPs" 2011-06-02 21:13:13 -07:00
satok
f40ea49fc8 Merge "Update internal states stored in InputMethodManager properly" 2011-06-02 20:59:14 -07:00
Dianne Hackborn
b84e4b11fa 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
8453c5fa89 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
Tadashi G. Takaoka
05562b04ba 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
fba5de639d 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
9299648156 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
eb2cd90c00 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
63c7259ee0 resolved conflicts for merge of 39ddeae0 to master
Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
2011-06-02 18:49:11 -07:00
Jeff Brown
aa3c9b3db9 Merge "Fix ABS_MT_SLOT handling." 2011-06-02 18:31:47 -07:00
satok
79fce1af5c Merge "resolved conflicts for merge of 7e2181c0 to master" 2011-06-02 18:28:58 -07:00
satok
fa088ed673 resolved conflicts for merge of 7e2181c0 to master
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
2011-06-03 10:26:15 +09:00
Wink Saville
22ff9d86f6 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
30fa58f972 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
56d1c25cec Merge "Fix 4518876: Disable lock screen rotation on phones." 2011-06-02 18:22:54 -07:00