Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,742 Commits 3 Branches 0 Tags
d7765e353cdc6f0bb4156841a8436ea28eb20eea
Commit Graph

47742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
d7765e353c am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode. 
* commit '73dc2602898a300306ad418ca5bec990f0de877f':
  LayoutLib: Fix issue with rendering mode.
 2011-04-06 12:50:01 -07:00
Xavier Ducrohet
73dc260289 am c5aeac7f: LayoutLib: Fix issue with rendering mode. 
* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
  LayoutLib: Fix issue with rendering mode.
 2011-04-06 12:41:17 -07:00
Xavier Ducrohet
c5aeac7f15 LayoutLib: Fix issue with rendering mode. 
When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.

This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.

Bug: http://code.google.com/p/android/issues/detail?id=15892

Change-Id: Ibb9ca2a67c6c450d10d9f9a8050536e094650f8b
 2011-04-05 20:45:48 -07:00
Scott Main
6bb507e9eb am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs 
* commit 'c70d483f4baffe5cb4ba09df3645aa6a1b351431':
  docs: fix the TOC in a few docs
 2011-04-05 14:32:15 -07:00
Scott Main
c70d483f4b am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs 
* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
  docs: fix the TOC in a few docs
 2011-04-05 14:28:23 -07:00
Scott Main
e4cafabbcc am a90eb8fe: docs: fix the TOC in a few docs 
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
  docs: fix the TOC in a few docs
 2011-04-05 14:21:36 -07:00
Scott Main
a90eb8fec1 docs: fix the TOC in a few docs 
Change-Id: Iff2b91701ba39e17cc0d88804f3eb3f658e13c27
 2011-04-05 14:05:03 -07:00
Adam Powell
2e68ec1bc6 am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:27:23 -07:00
Adam Powell
2bb59637ca am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:14:27 -07:00
Adam Powell
030b38ffc2 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Adam Powell
3c534772de Fix bug 4207704 - Gestures can be lost when Flash is enabled 
Pre-queue WebView touch events as we send them to webkit so that we
can run them through WebView later if webkit or hosted plugins go out
to lunch.

Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef
 2011-04-04 22:06:50 -07:00
Eric Laurent
7a492a9ad4 am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 17:44:50 -07:00
Mike Lockwood
824c6edce8 am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 17:44:46 -07:00
Trevor Johns
fa6b78890b am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 17:44:42 -07:00
Simon Wilson
442bf4cd1e am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 17:44:38 -07:00
Bill Gruber
0ac3183c64 am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
  SDK doc updates
 2011-04-04 17:35:34 -07:00
Bill Gruber
f0d2c1c4eb am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
  SDK doc updates
 2011-04-04 17:31:23 -07:00
Bill Gruber
63ac03794d am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
  SDK doc updates
 2011-04-04 17:21:25 -07:00
Bill Gruber
d36bc32ea9 Merge "SDK doc updates" into honeycomb 2011-04-04 17:15:08 -07:00
Bill Gruber
604917b339 SDK doc updates 
Change-Id: Iaf24235cf40a4e22a4c8ee787f0b18ce8f5cb61e
 2011-04-04 16:55:53 -07:00
Eric Fischer
2e715df8d4 am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:43:48 -07:00
Jason parks
5ee250aa74 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Justin Ho
d95fa2ff8c am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit '0f5e36deee14b9d21dcf8ca2986e63b38fa9354b':
  Updated CDMA roaming icons
 2011-04-04 16:43:23 -07:00
Jean-Baptiste Queru
e2fbd0a9b0 am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':
 2011-04-04 16:43:15 -07:00
Robert Greenwalt
e716a5515b resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
 2011-04-04 16:26:42 -07:00
Robert Greenwalt
da8beef556 am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
  Fix Default route after secondary net use.
 2011-04-04 15:25:45 -07:00
Brad Fitzpatrick
5851b8662d am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
e511fb33d3 am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
8f7aad147d am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
 2011-04-04 15:25:21 -07:00
Robert Greenwalt
549177e4f3 Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-04-04 15:07:41 -07:00
Robert Greenwalt
ffe8723ca2 resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp 
Change-Id: Ide9ed301618b89a1cced4885062c13047980890c
 2011-04-04 15:00:13 -07:00
Roman Nurik
84967294f2 am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
  Document support for .TS video containers.
 2011-04-04 13:47:34 -07:00
Roman Nurik
9131557721 am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
  Document support for .TS video containers.
 2011-04-04 13:44:23 -07:00
Roman Nurik
5a41a8a0fd Merge "Document support for .TS video containers." into honeycomb-mr1 2011-04-04 13:41:11 -07:00
Roman Nurik
c1b34f3d8e Document support for .TS video containers. 
Change-Id: I99a2da97ce2bbb79beb4a7b5847ad3de90a6b7af
 2011-04-04 12:51:18 -07:00
Eric Laurent
b7a76e84fd am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 12:25:37 -07:00
Mike Lockwood
179122ad56 am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit 'a8731e1e922512e5c22485e48059f33b61ab93ea':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 12:25:33 -07:00
Trevor Johns
ea477d2043 am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'cafbe87d5b6108d71e85950796b587f95d00cfac':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 12:25:29 -07:00
Simon Wilson
d7a8e8453d am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 12:25:25 -07:00
Eric Fischer
d20023ae44 am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
  Import revised translations.  DO NOT MERGE
 2011-04-04 12:20:38 -07:00
Jason parks
1d73362597 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Justin Ho
0f5e36deee am 87805ca3: Updated CDMA roaming icons 
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
  Updated CDMA roaming icons
 2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
0c61e10590 am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
 2011-04-04 12:19:26 -07:00
Robert Greenwalt
ab2194aade am 27725e8c: Only leave one default network up at a time. 
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
  Only leave one default network up at a time.
 2011-04-04 12:18:58 -07:00
Robert Ly
cbfeda13e7 am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb 
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
  Adding package description for android.hardware.usb
 2011-04-04 11:48:51 -07:00
Robert Ly
6f7e4cb5ae am 3f39f653: Adding package description for android.hardware.usb 
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
  Adding package description for android.hardware.usb
 2011-04-04 11:41:02 -07:00
Robert Greenwalt
37229514c5 Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 2011-04-04 11:23:51 -07:00
Robert Greenwalt
d685c731bf resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp 
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
 2011-04-04 11:21:23 -07:00
Robert Ly
3f39f653a9 Adding package description for android.hardware.usb 
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
 2011-04-04 11:07:46 -07:00
Brad Fitzpatrick
27e00544ea am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 11:03:03 -07:00