Commit Graph

32537 Commits

Author SHA1 Message Date
Amith Yamasani
c23eb91771 am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.
2011-06-14 15:38:31 -07:00
Amith Yamasani
98bbfc6a14 Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 2011-06-14 15:35:13 -07:00
Dianne Hackborn
bcb70efdce am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
  Fix issue #4603422: Compatibility mode button doesn't always update
2011-06-14 15:14:34 -07:00
Dianne Hackborn
b085343ab5 Merge "Fix issue #4603422: Compatibility mode button doesn't always update" into honeycomb-mr2 2011-06-14 15:12:01 -07:00
Robert Ly
85e922e51d am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
* commit '86ef7977a95d6e1783f646d96992582d1dbf080a':
  cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
2011-06-14 15:10:07 -07:00
Robert Ly
0e5750378f Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2 2011-06-14 15:06:42 -07:00
Robert Ly
26571649c6 am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit 'cbd31aec9f4a7367d440bfb0c9683bd481461995':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
2011-06-14 15:01:48 -07:00
Robert Ly
28fe7d5707 Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 2011-06-14 14:58:32 -07:00
Robert Ly
a46983068e am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit 'a91d6552913c02538b3f97e774e9771cfbef9dec':
  cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-14 14:58:11 -07:00
Robert Ly
b3c02f97a8 am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '9fa54704492234aed15ccdb29aae9261674811e3':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-14 14:58:08 -07:00
Robert Ly
14231eff1e Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-14 14:56:00 -07:00
Robert Ly
aefe60df4a Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-14 14:55:35 -07:00
Wink Saville
1f27373432 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
d404170880 Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Wink Saville
cf26b3e7f9 Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 2011-06-14 14:44:12 -07:00
Mathias Agopian
901d53f4d3 am 69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '69b4587bfbb3e98f793959d9123340360fa233a2':
  DO NOT MERGE. may fix build on some version of gcc
2011-06-14 13:26:38 -07:00
Mathias Agopian
7b1ef58d56 DO NOT MERGE. may fix build on some version of gcc
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
2011-06-14 12:05:42 -07:00
Dianne Hackborn
8d37f0002a am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '700a1f25719138b94c453beb6325e627a11a9883':
  Update resources documentation with new qualifiers.
2011-06-14 11:38:01 -07:00
Dianne Hackborn
fa1afdb42f am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
2011-06-14 11:36:05 -07:00
Dianne Hackborn
8cb535b11d Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 2011-06-14 11:27:09 -07:00
Dianne Hackborn
bfb01f297c Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 2011-06-14 11:24:29 -07:00
Mathias Agopian
4c83aefe59 am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit 'a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
2011-06-13 14:13:21 -07:00
Mathias Agopian
867740df05 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
2011-06-13 13:44:28 -07:00
Dianne Hackborn
37cb1b9f25 am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
* commit 'fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
  Fix some problems with moving in and out of detached state.
2011-06-10 18:39:48 -07:00
Dianne Hackborn
fcd83591ff Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 2011-06-10 18:37:22 -07:00
Jim Miller
ad83ca0f9d am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
* commit '8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
  Fix layout issue on table when device thinks there's a SIM.
2011-06-10 17:41:20 -07:00
John Wang
f3ae02f82a Merge "Add toString for IccCard Status and App." into honeycomb-LTE 2011-06-10 17:19:42 -07:00
Teng-Hui Zhu
65d19e0090 am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '90bdb69bf95e5865547a55260dd61744b0bcc911':
  fix one NPE when webChromeClient don't have progress view support
2011-06-10 14:22:52 -07:00
Teng-Hui Zhu
e473ce1b54 Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2 2011-06-10 14:19:22 -07:00
Robert Greenwalt
d5ba54c47f Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 2011-06-10 14:08:28 -07:00
Dianne Hackborn
fdc0e25f36 am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '2bb2d48f9ca1726b8de957ec7ea321c767409c12':
  Commit final (maybe) MR 2 API.
2011-06-09 19:26:25 -07:00
Dianne Hackborn
6b973401bc am d86302df: Quiet the log.
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
  Quiet the log.
2011-06-09 17:40:08 -07:00
Dianne Hackborn
657651f164 am f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit 'f795e9a86d4f62e5314ef95978c3ea17d90975db':
  Okay *now* really enforce the limit on non-public styles.
2011-06-09 17:28:00 -07:00
Dianne Hackborn
a0d8e424fd am 8821ba86: Ummm... f*, stop breaking the build.
* commit '8821ba860693f5206c56ae727a4231e4d6f0a735':
  Ummm...  f*, stop breaking the build.
2011-06-09 16:14:12 -07:00
Dianne Hackborn
3bbe6fb6b2 am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
2011-06-09 16:02:02 -07:00
Dianne Hackborn
729fc387b0 Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 2011-06-09 15:55:54 -07:00
Robert Greenwalt
f2f8aee7c3 Merge "Set locale based on SIM preferred language." into honeycomb-LTE 2011-06-09 15:48:16 -07:00
Dianne Hackborn
d4bfc93113 Enforce public resource restriction on bag parents.
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
2011-06-09 15:27:39 -07:00
James Dong
9266ee53dc am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
2011-06-09 12:03:52 -07:00
Mike Lockwood
ed158883f2 am b3174c46: UsbService: Fix JNI reference leak
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
  UsbService: Fix JNI reference leak
2011-06-09 12:01:31 -07:00
James Dong
f98f69241f Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Justin Ho
ad65602b71 am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
  Updating default wallpaper of large devices to match xlarge
2011-06-09 10:22:17 -07:00
Xavier Ducrohet
2efdc93e35 am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
2011-06-09 10:19:14 -07:00
Justin Ho
c762e30727 Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 2011-06-09 10:18:13 -07:00
Xavier Ducrohet
4734541892 Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
2011-06-09 10:12:40 -07:00
Dianne Hackborn
dbd950b87a am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
deb21d3eda Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 2011-06-08 22:33:34 -07:00
Dianne Hackborn
c7269cbfa6 am e22fe933: Fix issue #4582417: Need to add new PackageManager...
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
  Fix issue #4582417: Need to add new PackageManager...
2011-06-08 21:38:33 -07:00
John Wang
e179704ece Merge "Set emergency call text visibility." into honeycomb-LTE 2011-06-08 20:38:59 -07:00
Dianne Hackborn
2b6f1b12f7 am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
2011-06-08 20:02:43 -07:00