drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,512 Commits 1 Branch 0 Tags
Commit Graph

52512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
173e4c79b4 am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '9980043e930f877c4cd066de2b3d57dce4fc926e':
  Ummm...  f*, stop breaking the build.
 2011-06-10 13:00:41 -07:00
Dianne Hackborn
32ed8448d2 Merge "resolved conflicts for merge of f51ded0f to master" 2011-06-10 12:47:12 -07:00
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master 
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
 2011-06-10 12:45:36 -07:00
Svetoslav Ganov
8dffad68c7 Bug fixes in the accessibility interrogation APIs 
1. AccessibilityNodeInfo was not overriding equals.

2. ViewAncestor was not calling the callback for
   setting the result of an interrogation request
   thus making the system process wait upto the
   maximal timeout.

Change-Id: I040a3c12d97f48aee319ba6414879546e71e9b8e
 2011-06-10 12:43:00 -07:00
Adam Powell
679dd99cdc Merge "Fix some measurement/sizing with split action bars" 2011-06-10 11:59:03 -07:00
Adam Powell
cc2e5bea7d Fix some measurement/sizing with split action bars 
Change-Id: I5fded370d214eb0a50d06fd6a14446227d3b30ac
 2011-06-10 11:55:09 -07:00
Philip Milne
08b992c88e 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
a2aee84eee Merge "Upgrade of Calendar db to 305" 2011-06-10 11:36:15 -07:00
Dan Morrill
75f27b56a6 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
RoboErik
9734df5f0c Upgrade of Calendar db to 305 
Name changes for db upgrade and reorganization for easier
referencing of calendar/event columns.

Change-Id: Ic892729e1fa11c7971d99ec17d930db9300d44e9
 2011-06-10 10:58:31 -07:00
Chet Haase
ec609d3a36 Merge "Change Property.set() to throw UnsupportedOperationException by default" 2011-06-10 10:58:26 -07:00
Dan Morrill
5ffe6bc98d Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to 
master do to a merge conflict oversight.

Change-Id: I35e7b0e3ad008b2c350ce720848d1b91e2e9fc5b
 2011-06-10 10:53:43 -07:00
Philip Milne
f474870fe1 Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices. 
Change-Id: Iafb25b17fec9391664c81a7e213eeaa918254912
 2011-06-10 10:51:45 -07:00
Robert Greenwalt
9e7c20635f 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
0964c759d3 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
8df5fcfa62 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
b2ba51e6de 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
2dcb6e80b9 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
8c6d777da0 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
799b7f0c1a Merge "New device policy to disable camera." 2011-06-10 10:17:34 -07:00
Chet Haase
a2f78a3617 Change Property.set() to throw UnsupportedOperationException by default 
Change-Id: I2326e066e0b7ce63cbafe83a3a37b90a3d148c43
 2011-06-10 10:07:59 -07:00
Jamie Gennis
4532c5e49c Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder." 2011-06-10 10:05:04 -07:00
James Dong
be674b1864 Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition" 2011-06-10 09:57:01 -07:00
James Dong
d24f94989f Merge "Correctly handle crop rect event in SoftAVC.cpp" 2011-06-10 09:56:44 -07:00
Ben Komalo
2447edd85b New device policy to disable camera. 
This introduces a new policy that a DeviceAdmin can use to disable _all_
cameras on the device. A separate CL will be made on the media side to
watch this policy bit and act accordingly.

Bug: 4185303
Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
 2011-06-10 09:37:17 -07:00
Narayan Kamath
d3ee2fa184 Refactor some of TextToSpeech 
required to let the Settings code to the same logic
and not have to roll it's own.

Change-Id: I2766b8562c940182a2954555fb1854889c3ac91a
 2011-06-10 16:33:28 +01:00
Andreas Huber
c8841e2ef4 Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it." 2011-06-10 08:02:18 -07:00
Narayan Kamath
a5084e6389 Merge "Don't hardcode the default engine." 2011-06-10 07:53:56 -07:00
Narayan Kamath
22302fb7ba Don't hardcode the default engine. 
One point to note is that no TTS engine will be selected
by default if there are no system TTS engines.

Change-Id: I397061e3cf29b8a1c66e7864262b43621ef5100d
 2011-06-10 15:29:06 +01:00
Ben Murdoch
179c87f6e6 Merge WebKit at r84325: Update user agent string. 
Change-Id: I927bd1cfadb3cc5b68f93f761d4d82cdc4f54439
 2011-06-10 15:07:51 +01:00
Narayan Kamath
f13874ffe6 Merge "Some TTS fixes." 2011-06-10 06:23:17 -07:00
Narayan Kamath
abc63fbdda Some TTS fixes. 
(a) Document the undocumented queue mode (mode == 2)
(b) intern strings to fix a bug in removeCallbacksAndMessages
(c) remove an unnecessarly lock object, change the field it
guarded to volatile.

Change-Id: If46bbfe2afb047b3ba5b3cb9a90c292656379ec1
 2011-06-10 13:01:46 +01:00
Debashish Chatterjee
64c99171e8 Merge "Voicemail provider contract definition." 2011-06-10 04:42:32 -07:00
Debashish Chatterjee
489d2d546a Merge "Voicemail related fields in calllog provider." 2011-06-10 04:38:07 -07:00
satok
21e2f1b4a0 Merge "API to set additional subtypes" 2011-06-10 00:26:52 -07:00
satok
e7c6998e0a API to set additional subtypes 
Bug: 4321667

- Due to the voice team's strong request

Change-Id: Ia8bbc277c0987bde996e6f65541877cec96a3ca1
 2011-06-10 15:26:03 +09:00
Adam Powell
f7728ae964 Merge "Action buttons now use themable style." 2011-06-09 22:07:11 -07:00
Adam Powell
81cf3ecade Action buttons now use themable style. 
Obey action view layoutparams.

Change-Id: Ia466008465b57659615fbf9d450ce3fdb3c06379
 2011-06-09 22:01:16 -07:00
Brian Carlstrom
f6b6736d12 Merge "KeyChain API refinements" 2011-06-09 21:11:50 -07:00
Brian Carlstrom
93201f545b KeyChain API refinements 
Change-Id: I177ab4642e6cd1aa13526c14f0a707175fd79655
 2011-06-09 21:11:06 -07:00
Adam Powell
fdac5ea971 Merge "Refine the behavior of split action bars." 2011-06-09 21:08:52 -07:00
Adam Powell
1ab418a222 Refine the behavior of split action bars. 
Change-Id: I27212c7554025433ee366f0766971f0092b26d67
 2011-06-09 21:01:56 -07:00
Marco Nelissen
6b6091a140 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
5caa0ef360 Merge "Don't apply AA to rects with no rotation/perspective." 2011-06-09 18:55:14 -07:00
Romain Guy
181d0a6cce Don't apply AA to rects with no rotation/perspective. 
Change-Id: I21138d4d0589cc28f1dcffb8b675cd81a9900e24
 2011-06-09 18:52:38 -07:00
Dianne Hackborn
7bbf6f7d11 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
e6b03d0979 resolved conflicts for merge of 9dfd7d0a to master 
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
 2011-06-09 18:39:37 -07:00
Mathias Agopian
a8eedaee41 Merge "improve orientation sensor with gyro data" 2011-06-09 18:22:19 -07:00
John Wang
924b7c7496 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
4a081955a6 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