Commit Graph

35494 Commits

Author SHA1 Message Date
Adam Powell
53df9ca28f Merge "Fix some measurement/sizing with split action bars" 2011-06-10 11:59:03 -07:00
Philip Milne
a6eb679133 Merge "Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices." 2011-06-10 11:54:39 -07:00
RoboErik
639f7c3480 Merge "Upgrade of Calendar db to 305" 2011-06-10 11:36:15 -07:00
Dan Morrill
7f5bbbd1d6 Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight." 2011-06-10 11:01:48 -07:00
Chet Haase
afc8947d31 Merge "Change Property.set() to throw UnsupportedOperationException by default" 2011-06-10 10:58:26 -07:00
Robert Greenwalt
a024b1fd31 am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE
* commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
  Set locale based on SIM preferred language.
2011-06-10 10:33:23 -07:00
James Dong
7abe46bd9f am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit 'dc03da0444803983aef4988475f2d5dcdf0283e9':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
2011-06-10 10:32:21 -07:00
Mike Lockwood
6628fde552 am 6d60190a: am e502c536: am b3174c46: UsbService: Fix JNI reference leak
* commit '6d60190a3156e0ac69c800bbb10691b70ae9bd54':
  UsbService: Fix JNI reference leak
2011-06-10 10:32:16 -07:00
Justin Ho
66963de1bc am e9f203e4: am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit 'e9f203e44363f0ee035aa2cd6aad3d5680e6c94f':
  Updating default wallpaper of large devices to match xlarge
2011-06-10 10:32:10 -07:00
Xavier Ducrohet
c20d4c1589 am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '48305f327ff3839ddbfa5a6fb42a57150a69480c':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
2011-06-10 10:31:52 -07:00
Conley Owens
6bea5574fb am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit 'e668c0b69896996040f394e0a95f71dd4b9c6257':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
2011-06-10 10:30:38 -07:00
Ben Komalo
dc22fa852d Merge "New device policy to disable camera." 2011-06-10 10:17:34 -07:00
Jamie Gennis
2a2789b43c Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder." 2011-06-10 10:05:04 -07:00
James Dong
3931e26714 Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition" 2011-06-10 09:57:01 -07:00
James Dong
5031067de7 Merge "Correctly handle crop rect event in SoftAVC.cpp" 2011-06-10 09:56:44 -07:00
Andreas Huber
8de356915b Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it." 2011-06-10 08:02:18 -07:00
Narayan Kamath
7b0bf65288 Merge "Don't hardcode the default engine." 2011-06-10 07:53:56 -07:00
Dianne Hackborn
5ab93c6372 am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '5624b793cb791621a586931d9f02eefdf6cfc7c8':
  Commit final (maybe) MR 2 API.
2011-06-10 07:46:51 -07:00
Dianne Hackborn
3a7df501da am 88748e6d: am d86302df: Quiet the log.
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
  Quiet the log.
2011-06-10 07:46:27 -07:00
Dianne Hackborn
467d9dff62 am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.
2011-06-10 07:45:38 -07:00
Narayan Kamath
e1caff6b5c Merge "Some TTS fixes." 2011-06-10 06:23:17 -07:00
Debashish Chatterjee
249df4413e Merge "Voicemail provider contract definition." 2011-06-10 04:42:32 -07:00
Debashish Chatterjee
4174b3abce Merge "Voicemail related fields in calllog provider." 2011-06-10 04:38:07 -07:00
satok
1636c22c0f Merge "API to set additional subtypes" 2011-06-10 00:26:52 -07:00
Adam Powell
6976179f39 Merge "Action buttons now use themable style." 2011-06-09 22:07:11 -07:00
Brian Carlstrom
63db497d0c Merge "KeyChain API refinements" 2011-06-09 21:11:50 -07:00
Adam Powell
fdfdacbdca Merge "Refine the behavior of split action bars." 2011-06-09 21:08:52 -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
Marco Nelissen
c048df0cd7 am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
  Make sure we don't read from invalid fds
2011-06-09 18:56:02 -07:00
Romain Guy
46b0cbe5ca Merge "Don't apply AA to rects with no rotation/perspective." 2011-06-09 18:55:14 -07:00
Dianne Hackborn
f2cb354757 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
2011-06-09 18:42:55 -07:00
Dianne Hackborn
3ca5d8f6e0 resolved conflicts for merge of 9dfd7d0a to master
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
2011-06-09 18:39:37 -07:00
Mathias Agopian
c9af56c64b Merge "improve orientation sensor with gyro data" 2011-06-09 18:22:19 -07:00
John Wang
396638cfbe am 4d042048: am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
* commit '4d042048243f38d3062ab4719ac26c9154380115':
  Set emergency call text visibility.
2011-06-09 18:16:49 -07:00
Mathias Agopian
b6dc95800d am 60ee24fe: (-s ours) am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '60ee24fe487e765c1e6d598aff99b9a5355ef50a':
  Fix a leak in RefBase (DO NOT MERGE)
2011-06-09 18:16:37 -07:00
Dianne Hackborn
cbbd63fafb Merge "resolved conflicts for merge of e2aa0490 to master" 2011-06-09 18:00:13 -07:00
Romain Guy
a4e05c3c2a Merge "Add a way to measure potential framerate of the view hierarchy." 2011-06-09 17:50:51 -07:00
Dianne Hackborn
5ea8834ab9 resolved conflicts for merge of e2aa0490 to master
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
2011-06-09 17:50:36 -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
Gilles Debunne
1844b17bbc Merge "Text selection on phone" 2011-06-09 16:56:31 -07:00
Irfan Sheriff
591d27639e Merge "Remove interface disable in wifistatemachine" 2011-06-09 16:53:27 -07:00
Shimeng (Simon) Wang
da82d69345 Merge "Consider default zoom scale for mobile viewport." 2011-06-09 16:41:18 -07:00
Daisuke Miyakawa
af5d185f3b Merge "Add return value spec and fix typo." 2011-06-09 16:34:10 -07:00
James Dong
f349213d71 Merge "Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing" 2011-06-09 16:27:39 -07:00
Dianne Hackborn
706b72615d am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.
* commit '820caf7b04f1e5c83599437e9e783e91322eb4f9':
  Ummm...  f*, stop breaking the build.
2011-06-09 16:18:07 -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
Andy McFadden
35aafe7e15 Merge "Use public constants" 2011-06-09 16:08:16 -07:00
Fabrice Di Meglio
fe1832ae0f Merge "Add Configuration.getLayoutDirectionFromLocale()" 2011-06-09 16:08:00 -07:00
Dianne Hackborn
199512446d am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
2011-06-09 16:06:07 -07:00