Commit Graph

33039 Commits

Author SHA1 Message Date
Dianne Hackborn
ffd64a700a am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2
* commit 'b8d109318f6fc88d1a59ca0e6e362963cd06960c':
  Forgot this file.
2011-05-31 18:33:00 -07:00
Dianne Hackborn
1c131d4d87 am fd206560: Merge "Forgot this file." into honeycomb-mr2
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
  Forgot this file.
2011-05-31 18:30:01 -07:00
Dianne Hackborn
5207046002 Merge "Forgot this file." into honeycomb-mr2 2011-05-31 18:28:50 -07:00
Dianne Hackborn
f02132fc13 am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-05-31 18:11:29 -07:00
Dianne Hackborn
7c51115333 am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-05-31 18:08:27 -07:00
Dianne Hackborn
13520e8a76 Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 2011-05-31 18:05:26 -07:00
Joe Malin
f3b29e46b6 am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
2011-05-31 16:43:55 -07:00
Joe Malin
d44e27c691 am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
* commit 'd40a5d5cb754b132d6c10ae78a6214f38ed23f3d':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
2011-05-31 16:40:59 -07:00
Jeff Brown
68eadf66b2 am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
* commit '425f2a6d71b3af058630367d75b0b924bf1aee49':
  Use ViewConfiguration to seed input system configuration.
2011-05-31 15:51:21 -07:00
Jeff Brown
93600d98e1 am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
* commit '1311455f3ee8cbd2b2b83ec2d98e95e1da108743':
  Button state should reflect actual buttons. (DO NOT MERGE)
2011-05-31 15:50:59 -07:00
Jeff Brown
4c61cbe97d am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
* commit 'c272d4279493000928b8b7c6dbcf2d2b7d8d08b2':
  Use ViewConfiguration to seed input system configuration.
2011-05-31 15:44:04 -07:00
Jeff Brown
3576fc419f am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
  Button state should reflect actual buttons. (DO NOT MERGE)
2011-05-31 15:44:01 -07:00
Jeff Brown
5eba89ca43 Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 2011-05-31 15:42:18 -07:00
Jeff Brown
e63c757704 Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 2011-05-31 15:42:08 -07:00
Amith Yamasani
774eb124e7 am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
* commit 'eb01203447afd2606b77739a0bd0b2ea216756e4':
  Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:06:38 -07:00
Amith Yamasani
459541bd9c am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
* commit '0119a67e72790fb14b05130e18fa0785b4fa8531':
  Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:02:11 -07:00
Amith Yamasani
87d48487ae Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 2011-05-31 13:58:34 -07:00
Tadashi G. Takaoka
ebb08eadf0 am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
* commit '69a487763812d2c0fb3c9900b12862997bc77f4d':
  Fix input type judgment of WebTextView (DO NOT MERGE)
2011-05-31 00:23:25 -07:00
Tadashi G. Takaoka
05650ef7ee am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
* commit '8ede62745faa02265f927941d1195b6c1bf05ebb':
  Fix input type judgment of WebTextView (DO NOT MERGE)
2011-05-31 00:18:54 -07:00
Conley Owens
6204195ffa am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-29 09:00:21 -07:00
Xavier Ducrohet
81434ee171 am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.
* commit '228e4716278f450a95be5addacc3c6c940668493':
  Merge 6103e22c from honeycomb-mr1. do not merge.
2011-05-29 09:00:16 -07:00
Xavier Ducrohet
dc35d6e366 am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.
* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
2011-05-29 08:59:57 -07:00
Ed Heyl
eac92714af Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-29 08:21:53 -07:00
satok
c7223cbf05 am 93b05690: am 5485ff61: Reduce the number of notification icons on narrow screens.
* commit '93b05690ff006fa3f96ed5e09031e18d529ae794':
  Reduce the number of notification icons on narrow screens.
2011-05-28 00:06:55 -07:00
satok
6b5ebe00bf am 5485ff61: Reduce the number of notification icons on narrow screens.
* commit '5485ff6141ccebad2c171a9a51ffdbcb72703bd7':
  Reduce the number of notification icons on narrow screens.
2011-05-28 00:02:54 -07:00
Kazuhiro Ondo
7147799184 am 57675037: Further fix for SIM detection.
* commit '57675037aa279e715a966e2888a31c97381a5fe4':
  Further fix for SIM detection.
2011-05-27 19:32:04 -07:00
Dianne Hackborn
64dd0b07ca am 8075fe48: am 78470718: Fix various places that were using the wrong display metrics.
* commit '8075fe48bf345e4014de9b7bee8def5f4373457c':
  Fix various places that were using the wrong display metrics.
2011-05-27 17:16:19 -07:00
Dianne Hackborn
26d93f8457 am 78470718: Fix various places that were using the wrong display metrics.
* commit '784707187d96b731df5256c1c2adb0aaf9037239':
  Fix various places that were using the wrong display metrics.
2011-05-27 17:12:53 -07:00
Dianne Hackborn
7eb8eec83c am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.
* commit 'e5d377014b04022a04fd0b2b24b343d1e0ec8d2a':
  Fix compat mode bugs when updating apps.
2011-05-27 17:01:47 -07:00
Dianne Hackborn
db5b8b8472 am 8ea5e1d7: Fix compat mode bugs when updating apps.
* commit '8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d':
  Fix compat mode bugs when updating apps.
2011-05-27 16:58:33 -07:00
Dianne Hackborn
caf5f71308 am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.
* commit '528c49f112dce5f9687f30a9751e783196eca0c6':
  Add "tv" density for 720p screens.
2011-05-27 14:27:46 -07:00
Dianne Hackborn
b557e6f4f9 am b96cbbd1: Add "tv" density for 720p screens.
* commit 'b96cbbd11c4590bec846212c33361e02293f18b5':
  Add "tv" density for 720p screens.
2011-05-27 14:23:11 -07:00
Dianne Hackborn
c6291e0ff4 Add "tv" density for 720p screens.
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
2011-05-27 13:40:26 -07:00
Dianne Hackborn
fff4e3f140 am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit 'c058d38602a1ffe00e14b4ab32c876c252eabe6d':
  Small fixes and cleanup of resource config handling.
2011-05-27 12:47:59 -07:00
Dianne Hackborn
586645d0a0 am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit 'ff7622992f39d8e401ab23c5ce6a84f318906e52':
  Small fixes and cleanup of resource config handling.
2011-05-27 12:42:56 -07:00
Dianne Hackborn
d4e86e9fdb Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 2011-05-27 12:40:39 -07:00
Dianne Hackborn
c3f07924a5 Small fixes and cleanup of resource config handling.
Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
2011-05-27 12:09:11 -07:00
James Dong
516460c79b am 6c2db6fb: am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '6c2db6fb1925f291cc9748cf3bf0897b9001c972':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
2011-05-27 11:33:26 -07:00
James Dong
21aff54036 am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '95f397adb13aa69b15b53bb089078d4dbdb269f1':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
2011-05-27 11:29:46 -07:00
James Dong
a3eba24fdf Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2 2011-05-27 11:26:24 -07:00
Tadashi G. Takaoka
cd3f7e7c38 am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit 'e0a82fcc6058e6297d11a040aae13e37a2439c14':
  Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:55:23 -07:00
Scott Main
24e4e9677a am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
* commit 'de43d71bee336874a756545468d9adcf5e96e421':
  docs: adjust what's visible for online and offline docs
2011-05-27 10:49:33 -07:00
Tadashi G. Takaoka
379e889afa am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
  Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:48:52 -07:00
Tadashi G. Takaoka
0f4dfb3dd8 Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2 2011-05-27 10:47:12 -07:00
Scott Main
7f4f0e6bdf am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
* commit 'f128d5d49b95971d580b07dfdbeb513a0eb3d2df':
  docs: adjust what's visible for online and offline docs
2011-05-27 10:23:01 -07:00
Scott Main
536d8aba23 Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2 2011-05-27 10:17:41 -07:00
Wink Saville
04a9ccb41f am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
* commit '178b066096d94f078fdb32bf9f66755bae34819d':
  DataConnection FailCause should use errorCode rather than ordinal.
2011-05-27 09:15:19 -07:00
Wink Saville
2cdd998d51 Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE 2011-05-27 09:03:48 -07:00
Wink Saville
ec7ef21d2a am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
* commit '885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
  DataConnection : Have a separate alarm for each APN type.
2011-05-26 18:23:17 -07:00
Wink Saville
4468f6db4c am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
* commit 'e55e5e7c406bdedc67c6e536c981146e2b335b43':
  Derive ICC status from multiple application status for UICC
2011-05-26 18:21:29 -07:00