Scott Main
9742148fb2
Merge "docs: updates to menu resource doc for new attributes"
2010-12-15 12:11:10 -08:00
Patrick Dubroy
afde46ed00
Turn fatal assertion in decodeRegion into a warning.
2010-12-15 12:08:39 -08:00
Scott Main
14711b2b42
docs: updates to menu resource doc for new attributes
...
Change-Id: I6dd0553da6153839b54e4429db5e87d071e91e49
2010-12-15 12:08:25 -08:00
Scott Main
ccc15650e4
am 9278d321: am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
...
* commit '9278d3216837ad45eae13b87f04f050acb4ddafa':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
2010-12-15 12:01:58 -08:00
Scott Main
1957ce2da6
am d88c90fb: am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
...
* commit 'd88c90fb0805b2dda5664f413b32ada5a5fa6fdc':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
2010-12-15 12:01:53 -08:00
Scott Main
600cfd560e
am 8591872a: am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
...
* commit '8591872a5c37754aa3be3ef575d3de667f8ee70c':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
2010-12-15 11:59:16 -08:00
Scott Main
9278d32168
am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
...
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
2010-12-15 11:56:04 -08:00
Scott Main
d88c90fb08
am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
...
* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
2010-12-15 11:56:00 -08:00
Scott Main
8591872a5c
am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
...
* commit '92b0308530d21195425c918cbe6057dd84f37992':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
2010-12-15 11:53:20 -08:00
Scott Main
52078255da
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd
...
docs: fix bug 3216642
Change-Id: Ic42d97d4e67a09dc4e366862e2b72ff92f152b85
2010-12-15 11:49:42 -08:00
Eric Laurent
828b5a328c
Merge "Change audio routing policy for HDMI"
2010-12-15 11:48:46 -08:00
Scott Main
6390fa6bdf
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee
...
docs: fix bug 3273882
Change-Id: Ie53ba246c39bf448bfe199ae3754e50749ceb340
2010-12-15 11:47:38 -08:00
Adam Cohen
80bc16f7df
Merge "New stack visualization"
2010-12-15 11:20:43 -08:00
Irfan Sheriff
fe0d290b8c
Merge "Use clear names for native API"
2010-12-15 11:18:04 -08:00
Robert Greenwalt
96eb20f0df
Merge "Fix some older (depricated) API so they work."
2010-12-15 11:13:21 -08:00
Irfan Sheriff
5d001ea027
Use clear names for native API
...
Change-Id: I96c3089e10c75f433410f66c01204b7e5de2dc55
2010-12-15 11:08:29 -08:00
Alex Sakhartchouk
57286753c3
Merge "Cleanup and refactoring of an earlier cl."
2010-12-15 11:05:23 -08:00
Dianne Hackborn
99441c45e4
Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity
...
{com.android.settings/com.android.settings.applications.StorageUse}
AbsListView could call mAdapter.getItemId() if a save state happened
after the data changed but before a layout occurred.
Change-Id: Ica020971dc458dff79b56dd810733e217f4f7da6
2010-12-15 11:02:55 -08:00
Eric Laurent
2c61bee2b0
Change audio routing policy for HDMI
...
HDMI device should have a higher priority than analog dock audio but a lower priority
than wired headsets.
Also modified AudioService so that HDMI is mapped to DEVICE_OUT_AUX_DIGITAL device and not
DEVICE_OUT_DGTL_DOCK_HEADSET as before to enable discrimination between SPDIF going to
digital dock and SPIDF going to HDMI.
Change-Id: I887d0c73479784dd2edaf41ce1a7d8d0bdcbb4bd
2010-12-15 11:01:48 -08:00
Robert Greenwalt
778c0ba858
Fix some older (depricated) API so they work.
...
Just because they're depricated doesn't mean we can neglect them.
Change-Id: I7556456bd8be2ec57b81b092f75b4b613b538d46
2010-12-15 10:43:04 -08:00
Irfan Sheriff
3a65de795d
Initialize network state on start
...
Bug: 2542613
Change-Id: I5b16b2dc866c7f25bc61f1a04cf5fa9938ec2c3e
2010-12-15 10:15:02 -08:00
Alex Sakhartchouk
0857196107
Cleanup and refactoring of an earlier cl.
...
Change-Id: I5e356ed88375a1620846e0c500659e3b7ead5030
2010-12-15 10:11:31 -08:00
Irfan Sheriff
320a4beda3
Merge "Handle supplicant stop correctly"
2010-12-15 09:58:12 -08:00
Huahui Wu
957e9ca26e
Merge "b/2864818 Prompt the SSL error dialog to user and proceed or cancel the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529 "
2010-12-15 09:42:35 -08:00
Huahui Wu
ad053cebc8
b/2864818 Prompt the SSL error dialog to user and proceed or cancel
...
the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529
Change-Id: I1f4c69c6ddb92324a1ec3c193018e8d703454f56
2010-12-15 09:38:54 -08:00
Jim Miller
0a0753808e
Fix 3148496: Update LockScreen assets & layouts
...
This adds new assets for LockScreen on large devices and
fixes a layout bug in LockPatternView where the size was
not being computed correctly.
Change-Id: Ibaa0543502914010261389ef6e524654f4f87dc4
2010-12-15 09:28:56 -08:00
Andreas Huber
08f83a6cd8
Merge "Emit better (correct) timestamps that respect AAC upsampling."
2010-12-15 09:17:21 -08:00
Ben Murdoch
92272ab189
Merge "Remove fragment as well as the query from URLs when resolving MIME type"
2010-12-15 09:07:02 -08:00
Irfan Sheriff
96071a7031
Handle supplicant stop correctly
...
- Use a clean terminate for a regular stop and on failure kill supplicant. This prevents
WifiMonitor from getting hung permanently on a socket in case of a kill
- When WifiMonitor exits, kill supplicant and cleanup sockets
Change-Id: I87c32e03d945433f33eed8c326d7f0368925bf55
2010-12-15 08:37:05 -08:00
Leon Scroggins
828e8800b1
Merge "Make a long press on a textfield work."
2010-12-15 07:07:51 -08:00
Leon Scroggins
fcf577665b
Make a long press on a textfield work.
...
Bug:3268584
Even if the WebTextView has not been set up yet.
Change-Id: I8ec2c4ef8146006d6ee84d08e1ddbdb099125047
2010-12-15 09:50:53 -05:00
Ben Murdoch
1870015932
Remove fragment as well as the query from URLs when resolving MIME type
...
When we try to deduce the MIME type from the file extension of
a URL, strip the fragment off at the same time we are stripping
the query. Otherwise we end up trying to match against some
funny extensions.
Bug:3241908
Change-Id: Ibaa84f0a628f37cd012b6cfbed9a6a666ecae8bb
2010-12-15 11:13:16 +00:00
Jason Sams
1eb9f161a6
Merge "Fix mipmap bug introduced with Allocation cleanup. Add syncAll to rsg headers."
2010-12-15 02:11:26 -08:00
Jason Sams
6d8eb266dd
Fix mipmap bug introduced with Allocation cleanup.
...
Add syncAll to rsg headers.
Change-Id: I02c953f3fddab3c6f4e98570cdad45a59711bbde
2010-12-15 01:41:00 -08:00
Dianne Hackborn
ee02d83e49
Merge "Fix launching of activities that I broke."
2010-12-15 00:22:43 -08:00
Dianne Hackborn
194157638a
Fix launching of activities that I broke.
...
Change-Id: I39f4189bad6bdecdc7f9362410f36453fd816121
2010-12-15 00:20:27 -08:00
Mike Lockwood
a9a3511e47
Add CHAR LIMIT for media storage write permission description strings
...
BUG: 3174768
Change-Id: I0fa4f34bd6f721ebaefa77d3af3c92bf62fc0b31
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 23:50:20 -08:00
Mike Lockwood
4453aa4c30
CameraBrowser: Catch ActivityNotFoundException when attempting to display imported file.
...
Change-Id: I448f2506caf0a5599c885654fd0078beb6240965
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 23:38:43 -08:00
James Dong
1bfdfc63b3
Merge "Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature"
2010-12-14 22:25:02 -08:00
Dianne Hackborn
4f3867e3ce
Time to remove some old APIs!
...
Change-Id: I73ca23b0d5c7971a00dfa05357f9b630d9b6ebc8
2010-12-14 22:19:03 -08:00
James Dong
88b7741228
Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature
...
Change-Id: I48c94b7a77a717c15fac548c7068a8a3e62c79fb
2010-12-14 22:13:14 -08:00
satok
6866d6912b
Merge "Fix the bug that IME switch button is shown when there are two IME is installed but only one IME is enabled."
2010-12-14 21:01:05 -08:00
satok
07e7279cb4
Fix the bug that IME switch button is shown when there are two IME is installed but only one IME is enabled.
...
Bug: 3286682
Change-Id: I6a9c6972c136ca8df85ab2b305d08120c09a4543
2010-12-15 13:46:46 +09:00
Mathias Agopian
1ebaa3a379
Fix a problem where hwc and GL composition could show a different buffer
...
if a surface's buffers are reallocated, the current active buffer will
end-up pointing on one of these until a new buffer is retired.
we're now keeping a reference to the actual buffer until we retire a
new one.
Change-Id: Ib1703947e7a0340694d846e0962576318863b935
2010-12-14 20:30:37 -08:00
Romain Guy
478fed84a0
Merge "Cleanup OpenGLRenderer::drawLines()"
2010-12-14 20:13:18 -08:00
Romain Guy
8d0d4783a0
Cleanup OpenGLRenderer::drawLines()
...
Change-Id: I3545a616e964335897c6e4148c431a07a2ce2a8b
2010-12-14 20:13:35 -08:00
Mike Lockwood
00ffc9d6d2
Merge "Clean up USB notifications:"
2010-12-14 19:23:02 -08:00
Romain Guy
7dddf275cd
Merge "Fix the build."
2010-12-14 18:43:44 -08:00
Romain Guy
67b79ec6e3
Fix the build.
...
Change-Id: I798d4467b891cce2038da0167467c8a603b647a6
2010-12-14 18:45:12 -08:00
Mathias Agopian
1616dec331
Merge "fix debug.sf.showbackground"
2010-12-14 18:40:18 -08:00