Joe Onorato
8be410a9dd
Merge "turn off log spew"
2011-04-06 12:04:35 -07:00
Joe Onorato
64c13342a6
Merge "Move around the HDMI switch detection so we don't try to get the status if we can't listen to it."
2011-04-06 12:04:24 -07:00
Jason Sams
b45c7e8e19
Merge "Cleanup character limits."
2011-04-06 11:45:42 -07:00
Jason Sams
39962a1476
Merge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation."
2011-04-06 11:40:33 -07:00
Jason Sams
4ca92efc3e
Merge "Seperate GL from RS program store."
2011-04-06 11:30:24 -07:00
Dianne Hackborn
592e3fc150
Add new resource configurations for screen width/height in "dp".
...
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
2011-04-06 11:00:37 -07:00
Brian Carlstrom
b76dd6c566
Merge "Don't use local ref for cached jclass reference in JNI code"
2011-04-06 10:06:00 -07:00
Irfan Sheriff
6928debdc8
Merge "Add support for supplicant SCAN_INTERVAL"
2011-04-06 09:16:26 -07:00
Fabrice Di Meglio
9121ad8643
Merge "TextLayoutCache - more code refactoring"
2011-04-05 15:38:06 -07:00
Brian Carlstrom
f34d4f455c
Merge "Fix usages of PopLocalFrame to include returned local reference"
2011-04-05 15:26:04 -07:00
Scott Main
25f445f9d0
am 6bb507e9: am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
...
* commit '6bb507e9ebdaff0370b2826f9a4a73156997c498':
docs: fix the TOC in a few docs
2011-04-05 14:35:37 -07:00
Scott Main
27f58106ef
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
fc182c2c9a
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
Fabrice Di Meglio
e3b66f3a6c
Merge "Code refactoring for TextLayoutCache"
2011-04-05 14:23:23 -07:00
Scott Main
3bf2275eec
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
Mike LeBeau
b124c00c97
Merge "Add EXTRA_ORIGIN to RecognizerIntent."
2011-04-05 14:03:55 -07:00
Mike Lockwood
ae8e554528
Merge "MTP and media provider support for multiple storage devices:"
2011-04-05 13:36:49 -07:00
Kenny Root
e354af7700
Merge "Update installd to allow multiuser"
2011-04-05 13:17:02 -07:00
Mike Lockwood
30a1fafdd7
Merge "MountService: Fix running media scanner at boot."
2011-04-05 12:41:47 -07:00
Mike Lockwood
cd72877125
Merge "Fix deadlock in MountService"
2011-04-05 12:41:35 -07:00
Eric Laurent
3a35b53aaa
Merge "New fix for issue 4111672: control block flags"
2011-04-05 12:23:28 -07:00
Adam Powell
b8d46ae37e
am 2e68ec1b: am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
...
* commit '2e68ec1bc6e9ab57cd884d32b08dbb389189e7a4':
Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:30:52 -07:00
Mike LeBeau
5c57302201
Merge "Support speech recognizer confidence values."
2011-04-05 11:27:55 -07:00
Adam Powell
9fd2edebe8
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
Eric Fischer
1fac50707f
Merge "Import revised translations."
2011-04-05 11:18:57 -07:00
Adam Powell
7ce2ea95e9
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
78b135de42
Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
2011-04-05 10:45:25 -07:00
Eric Laurent
512283f4ae
am 7a492a9a: am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
...
* commit '7a492a9ad42947a3a7b777b0eb6eec56f5bb942b':
Issue 4157048: mic gain for VoIP/SIP calls.
2011-04-05 10:27:06 -07:00
Mike Lockwood
c30e2fa200
am 824c6edc: (-s ours) am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
...
* commit '824c6edce8f79aac9c98caabd9b8857d4c580629':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
2011-04-05 10:27:03 -07:00
Trevor Johns
2c8999b4b9
am fa6b7889: am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
...
* commit 'fa6b78890b17f6df2175b143783174ab5e7f7758':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-04-05 10:27:01 -07:00
Simon Wilson
e6b56e35de
am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-05 10:26:54 -07:00
Eric Laurent
2c33e89577
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
e26dbc56ce
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
b5ab4f3aa8
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
8757f75762
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
Christopher Tate
56f6526949
Merge "Fix deadlock in BackupManagerService"
2011-04-04 17:41:22 -07:00
Mike Lockwood
5799997584
Merge "StorageManager: Add getVolumeList() and getVolumeState() methods"
2011-04-04 17:39:21 -07:00
Mike Lockwood
30e4b4adee
Merge "MountService: Add support for multiple volumes"
2011-04-04 17:39:15 -07:00
Bill Gruber
a6caaa0a86
am 0ac3183c: am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb
...
* commit '0ac3183c6489120fa84df9e289b2db31fb49c842':
SDK doc updates
2011-04-04 17:37:46 -07:00
Bill Gruber
5baaac6fbb
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
fed3b263c6
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
24fe32e301
am d36bc32e: Merge "SDK doc updates" into honeycomb
...
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
SDK doc updates
2011-04-04 17:21:25 -07:00
Bill Gruber
6cba82c9da
Merge "SDK doc updates" into honeycomb
2011-04-04 17:15:08 -07:00
Eric Fischer
82881420f0
am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
Import revised translations. DO NOT MERGE
2011-04-04 16:46:38 -07:00
Jason parks
d66f55e1f7
am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
Send out a broadcast that the system is being factory reset.
2011-04-04 16:46:34 -07:00
Justin Ho
4f9dabb61d
am d95fa2ff: am 0f5e36de: am 87805ca3: Updated CDMA roaming icons
...
* commit 'd95fa2ff8cf7cc302dab5de0f1becf67bd298898':
Updated CDMA roaming icons
2011-04-04 16:46:31 -07:00
Jean-Baptiste Queru
0e35493791
am e2fbd0a9: am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread
...
* commit 'e2fbd0a9b03956dbb7d787ed435b895cfc735780':
2011-04-04 16:46:29 -07:00
Robert Greenwalt
f4af360d11
am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
...
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
Only leave one default network up at a time.
2011-04-04 16:44:25 -07:00
Eric Fischer
ec180cff05
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
a22e688842
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