Joe Onorato
d37870af20
Don't crash if there is no phone app and someone presses the phone button.
...
The phone button probably doesn't exist on products without phone apps,
but the monkeys still know how to find it.
Change-Id: I36aca53506c8d7d7565df8674aff9d59745139e0
2010-10-07 12:22:56 -04:00
James Dong
cf2bdd1fd8
Merge "0-memcpy video recording framework"
2010-10-07 08:11:26 -07:00
satok
7f35c8cc88
Show "more" button in the dialog of InputMethodSubtypePicker
...
- Handle subtypes correctly in InputMethodPicker
Change-Id: I0ff9baec46724ca9dee2a7943fee69d4b204589e
2010-10-07 23:59:18 +09:00
Kristian Monsen
b5c564fed2
Merge WebKit at r68651 : Update user agent string
...
Change-Id: Ib48186532c9a6033f1fb107f1fc072cd4fe89820
2010-10-07 11:17:12 +01:00
James Dong
769bb2aaa4
0-memcpy video recording framework
...
Part II: proposed camera hal change
Change-Id: I51663cf5de2b00f71e4ff1828080094676065444
2010-10-07 02:09:03 -07:00
satok
5847b20c0c
Merge "Add InputMethodEnabler for enabling input methods and subtypes"
2010-10-06 22:46:32 -07:00
satok
47a44916e2
Add InputMethodEnabler for enabling input methods and subtypes
...
- Copyed functionarity from LanguageSettings.java
TODO: Save enabled InputMethodSubtypes
Change-Id: I7b4fb1a79cb8b3229f88773d261430e23ba7aae2
2010-10-07 14:43:16 +09:00
Jeff Sharkey
7172bdac31
Assign parent TextAppearances to Holo.Light theme.
...
Change-Id: I60e82ec78c4e766bf1fbd86a0d6cd6c972cbbf81
2010-10-06 22:37:04 -07:00
Jim Miller
c3a44b6b60
Fix RecentApps to properly load new thumbnails.
...
This fixes a bug introduced into recents by changes to
Carousel to prevent flashing in Music2. Recents used
to rely on CarouselView.createCards() to reload the
thumbnails, which lead to flashing in Music2. Now
the request to update is explicit.
Change-Id: I57d409c6b5969b788b52d4c1b3bbccab54d86bcb
2010-10-06 20:55:13 -07:00
Romain Guy
e743bd2bac
Merge "Don't clear the framebuffer when not needed."
2010-10-06 19:51:36 -07:00
Romain Guy
6b7bd24659
Don't clear the framebuffer when not needed.
2010-10-06 19:49:23 -07:00
James Dong
10649792d6
Add two more options to "recordvideo" utility
...
o also removed unused code
Change-Id: I49471b0ac1cf70b5eedcde78a21e7770c312c5d6
2010-10-06 19:07:40 -07:00
Christopher Tate
5ada6cb059
More drag/drop adjustments:
...
* Make View.onDragEvent() public instead of protected.
* No longer @hide View.startDrag()
* Properly manage the boundaries of DRAG_STARTED / DRAG_ENDED notifications
to windows (and as a result don't send bogus empty DRAG_STARTED events or
double-recycle pooled DragEvents)
Change-Id: Ib75f5c1417640c82a5b043c555e02d6e6f4b4d9c
2010-10-06 17:33:10 -07:00
Brett Chabot
c7912274b0
am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread
...
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'
* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
Failing test cleanup.
2010-10-06 17:10:48 -07:00
Adam Powell
6ed895a4fa
am 41170a1a: am abcbb1a1: Fix bug 3061544 and some clipping errors.
...
Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9'
* commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9':
Fix bug 3061544 and some clipping errors.
2010-10-06 17:08:52 -07:00
Hung-ying Tyan
f209cd7062
am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
...
Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916'
* commit 'a785a59c831256f274627f8f8eb77f9d54508916':
SIP: add SERVER_UNREACHABLE error code.
2010-10-06 17:08:43 -07:00
Hung-ying Tyan
828c89ba8e
am 3cb2d3be: am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
...
Merge commit '3cb2d3be6cb501c77c7a5765d954363125857cca'
* commit '3cb2d3be6cb501c77c7a5765d954363125857cca':
SipService: supply PendingIntent when open a profile.
2010-10-06 17:08:34 -07:00
Dianne Hackborn
72b526a13c
am cb9f1e4d: am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
...
Merge commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'
* commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
Make it easier to figure out whether an app can go on sd card.
2010-10-06 17:08:15 -07:00
Neal Nguyen
e2562ca8f1
am daa9b8c6: am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
...
Merge commit 'daa9b8c69a3069d5533176e6caa286380b4675c2'
* commit 'daa9b8c69a3069d5533176e6caa286380b4675c2':
Fixing some flakiness of some DL Manager tests.
2010-10-06 17:07:58 -07:00
Jeff Brown
3caf37eb32
am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
...
Merge commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'
* commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
Fix Looper leaks in MediaRecorderStressTest.
2010-10-06 17:07:49 -07:00
Mathias Agopian
499f518400
am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
...
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'
* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-06 17:07:39 -07:00
Mathias Agopian
7930b5bc06
am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden
...
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'
* commit '722665c5f76e81bed646490977ea30f38aaa00da':
fix build. SurfaceView.setFrame needed to be hidden
2010-10-06 17:07:30 -07:00
Mathias Agopian
40e8289934
Merge "resolved conflicts for merge of bba3b8ef to master"
2010-10-06 17:04:44 -07:00
Mathias Agopian
d2a71c793e
resolved conflicts for merge of bba3b8ef to master
...
Change-Id: I4a63f4be3b9f7d236e03e9b27f6d1da6f8ced449
2010-10-06 17:03:41 -07:00
Romain Guy
a6983b4ee5
Merge "Apply 3D transformations to gradient shaders."
2010-10-06 17:00:20 -07:00
Romain Guy
e3095e0c1e
Apply 3D transformations to gradient shaders.
...
This fixes only linear gradients. Sweep and radial gradients, as well as
bitmap shaders, will be fixed in a future commit.
Change-Id: I4eee4ff62e9bbf3b9339fc111a780167449ecfef
2010-10-06 16:57:29 -07:00
Mathias Agopian
367a39fbaa
resolved conflicts for merge of 9fa7926b to master
...
Change-Id: I0d597d431ecebfb9d9d6e7902689c9ba95e75876
2010-10-06 16:53:36 -07:00
Mathias Agopian
fcf43e7d59
Merge "libagl: eglSwapInterval fix"
2010-10-06 16:45:56 -07:00
Ari Hirvonen
1d83631af5
libagl: eglSwapInterval fix
...
SW egl returned always EGL_FALSE even when the display was valid.
This made calls to eglSwapInterval to fail on HW since the wrapper
fails if either SW or HW egl fails.
Letting SW eglSwapInterval to return true when display is valid is
ok since spec says that interval parameter is silently clamped.
Change-Id: Ib4aa1dbfccf510a0f36621796e79a4d46852ee6a
2010-10-06 16:44:37 -07:00
Adam Powell
3a05ff487f
am 815b1eb8: (-s ours) am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
...
Merge commit '815b1eb870ea5b1d28de5be768d49e95c776c846'
* commit '815b1eb870ea5b1d28de5be768d49e95c776c846':
Fix bug 3061769
2010-10-06 16:22:03 -07:00
Mathias Agopian
3243cbc9b2
am b99e81ab: am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
...
Merge commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2'
* commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2':
fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-06 16:17:44 -07:00
Elliott Hughes
bd6b6babde
am 86214276: am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
...
Merge commit '86214276e05d81e4820862341ce9e2e3c83cd136'
* commit '86214276e05d81e4820862341ce9e2e3c83cd136':
Manually revert a single-line error inserted by OpenJDK.
2010-10-06 16:17:27 -07:00
James Dong
8c4a042984
am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
...
Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'
* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-06 16:17:14 -07:00
Nick Pelly
664d035829
am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
...
Merge commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'
* commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
New API stubs: NdefMessage and NdefRecord.
2010-10-06 16:16:56 -07:00
Alex Sakhartchouk
38d509697c
Merge "changing vec4 to vec2 for perf reasons."
2010-10-06 16:09:36 -07:00
Gilles Debunne
3139ab218a
am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset."
...
Merge commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'
* commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
Revert "Restored ic_dialog_menu_generic asset."
2010-10-06 16:07:42 -07:00
Gilles Debunne
efaa4f075d
resolved conflicts for merge of 1153629c to master
...
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
2010-10-06 14:38:27 -07:00
Marco Nelissen
91b7b0a33f
Merge "Fix simulator build, part 1/n"
2010-10-06 12:26:23 -07:00
Marco Nelissen
fd1e4ad52c
Fix simulator build, part 1/n
...
Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
2010-10-06 12:23:02 -07:00
Neel Parekh
03bc711c8a
Merge "Fix pressed vs selected typo in onCreateDrawableState"
2010-10-06 11:45:55 -07:00
Neel Parekh
e537858ba7
Fix pressed vs selected typo in onCreateDrawableState
...
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
2010-10-06 11:39:53 -07:00
Irfan Sheriff
be93061e2c
Merge "Add LinkAddress"
2010-10-06 11:26:44 -07:00
Gil Dobjanschi
ff61e8bea7
Merge "Added VideoEditor reference to protected AudioTrack constructor"
2010-10-06 11:26:24 -07:00
Shimeng (Simon) Wang
e99b0b992a
Merge "Add wrapper method for native JNI call."
2010-10-06 11:20:05 -07:00
Alex Sakhartchouk
d2091639be
changing vec4 to vec2 for perf reasons.
...
Change-Id: Ic885a6dc697af4fd82e184158772863673f041bd
2010-10-06 11:15:01 -07:00
Irfan Sheriff
ed5d7d17c9
Add LinkAddress
...
LinkAddress stores IP address + prefix for a network link
Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Gil Dobjanschi
0ca0a12c6b
Added VideoEditor reference to protected AudioTrack constructor
...
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
2010-10-06 10:53:49 -07:00
Adam Cohen
32e60fbea7
Merge "Fixing AdapterViewAnimator crash when associated adapter is empty"
2010-10-06 10:43:18 -07:00
Adam Cohen
3042944c6e
Fixing AdapterViewAnimator crash when associated adapter is empty
...
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
2010-10-06 10:39:11 -07:00
Irfan Sheriff
128cecab96
Add proxy settings per wifi network
...
Provide per network proxy settings configuration
for wifi. This is stored along with the ip configuration
in ipconfig.txt
bug: 3039302
Change-Id: Ic8bc14493583be19fde3d7c463d1e5a77e6df25f
2010-10-06 10:36:36 -07:00