33281 Commits

Author SHA1 Message Date
Xavier Ducrohet
556866a2ea am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp

* commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
  Parser is optional in obtainStyledAttributes.
2010-10-07 07:16:51 -07:00
Hung-ying Tyan
909a974f8e am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread
Merge commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387' into gingerbread-plus-aosp

* commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387':
  SIP: Fix busy authentication loop.
2010-10-07 07:16:45 -07:00
Dianne Hackborn
55f1b0b82f am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
2010-10-07 07:16:34 -07:00
Kenny Root
6ed0cfd3e7 am 5919ac6b: OBB: track binder death observers
Merge commit '5919ac6b4188285324646772501ef4b97b353cf4' into gingerbread-plus-aosp

* commit '5919ac6b4188285324646772501ef4b97b353cf4':
  OBB: track binder death observers
2010-10-07 07:16:18 -07:00
Kenny Root
36455d0325 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
2010-10-07 07:16:08 -07:00
Dianne Hackborn
e89bf50261 am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp

* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-07 07:15:57 -07:00
Gilles Debunne
f960718c1c am 1ae32bfe: New assets for buttons and notification
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
2010-10-07 07:15:05 -07:00
Dianne Hackborn
cef38339e7 am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Merge commit '6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp

* commit '6d44456da87dccb15b4086696f5e72a5aa198926':
  Make USB mass storage hide keyguard when shown.
2010-10-07 07:13:47 -07: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
Hung-ying Tyan
62ec9834a0 Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread 2010-10-06 23:11:09 -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
Adam Powell
fbb3b4768e Fix bug 3066313 - integrate new text anchor assets.
This adds the differentiated left/right anchors for hdpi and further
tweaks the behavior of text anchors.

Highlights:
* New assets are translucent - increased visibility for whatever is
  beneath.
* Start and end anchors may not cross one another.
* Minimum selection size is now 1.
* Touch targeting tweaked.

Change-Id: I601361323916ee19149562a23dc3242d908da45c
2010-10-06 21:46:28 -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
Hung-ying Tyan
9db99a4dc1 Make SipService broadcast SIP_SERVICE_UP when it's up.
http://b/issue?id=3062010

Change-Id: I13419fa3a8fdfba1977260f703e4dcaa42a6606c
2010-10-07 09:15:25 +08:00
Dianne Hackborn
bfba7cab94 Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
Change-Id: Ibc12a7326a13c318205774e226ed1f62a5cf11eb
2010-10-06 17:58:05 -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
Eric Fischer
70f1a3b8a0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:17 -07:00
Xavier Ducrohet
656d21656a Merge "Parser is optional in obtainStyledAttributes." into gingerbread 2010-10-06 17:32:10 -07:00
Hung-ying Tyan
16c29bd7f2 Merge "SIP: Fix busy authentication loop." into gingerbread 2010-10-06 17:29:28 -07:00
Dianne Hackborn
9d6824cd53 Merge "Make Activity.removeDialog() less strict." into gingerbread 2010-10-06 17:26:16 -07:00
Eric Fischer
3d1841c788 Import revised translations. DO NOT MERGE
Change-Id: Id9a7d2da704ed4d37efa8646815835fc6a7c5473
2010-10-06 17:11:06 -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
Dianne Hackborn
d2ce8bbb84 Make Activity.removeDialog() less strict.
It was extremely annoying not being able to do this.

Change-Id: I9a13b4fdd984a5e9d8f9ac49c7ede218c4481c2b
2010-10-06 17:09:47 -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
Kenny Root
5919ac6b41 OBB: track binder death observers
An incorrect assumption about how death observers were tracked lead to
an IllegalArgumentException in some cases. Make sure the linking and
unlinking of the Binder to its ObbState death observer is symmetric to
avoid this problem.

Bug: 3062360
Change-Id: Idd016db12551c80cd74d00f11cf6569bd3b4ce21
2010-10-06 17:00:00 -07:00
Kenny Root
a3ee5c0351 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -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
Dianne Hackborn
ef083ec008 Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 2010-10-06 16:56:02 -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