Commit Graph

26670 Commits

Author SHA1 Message Date
Shih-wei Liao 2dbe1cdaf1 am 38f79d01: Merge "Make ImageProcessing work." into honeycomb
* commit '38f79d01db07f7cc3d3b49d594b675adfa8959d5':
  Make ImageProcessing work.
2011-01-17 01:20:42 -08:00
Shih-wei Liao 8cb90181ba Merge "Make ImageProcessing work." into honeycomb 2011-01-17 01:18:32 -08:00
satok 1fbd9f7cdc am 5a1473ba: Merge "Implicitly/Explicitly subtypes bug." into honeycomb
* commit '5a1473bae0467693445b31454e4f736763276de8':
  Implicitly/Explicitly subtypes bug.
2011-01-16 23:50:06 -08:00
satok ada6606f5e Merge "Implicitly/Explicitly subtypes bug." into honeycomb 2011-01-16 23:48:24 -08:00
Adam Powell 9cda29cfdf am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4':
  Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
2011-01-16 20:00:17 -08:00
Adam Powell 6deb6ba9a5 Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb 2011-01-16 19:58:51 -08:00
Adam Cohen a60faa123f am d110889c: Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
* commit 'd110889cbca4d40f8cdeddfe6eb2f498f470ae4b':
  Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
2011-01-16 19:48:02 -08:00
Xavier Ducrohet fc7c5341c9 am 87ab45c0: Merge "LayoutLib: extract resource resolution into its own class." into honeycomb
* commit '87ab45c0fe4db814a7364fce3b88be3a49507e90':
  LayoutLib: extract resource resolution into its own class.
2011-01-16 19:40:42 -08:00
Xavier Ducrohet 38952f39f8 Merge "LayoutLib: extract resource resolution into its own class." into honeycomb 2011-01-16 19:38:33 -08:00
Jim Miller 9ffe3d6d98 am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb
* commit 'bdac9e0fbe874cf7414228624bd0d3af4f715ccc':
  Fix 3005526: Properly update StatusView from Password/PIN unlock
2011-01-16 19:28:25 -08:00
David 'Digit' Turner bc69eb5e71 am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb
* commit '3612f0870c4252a60b93332eadde780dc122a05b':
  SystemServer: Do not register null BlueTooth service in the emulator
2011-01-16 19:26:22 -08:00
Jim Miller 6b2336a486 Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb 2011-01-16 19:25:45 -08:00
David 'Digit' Turner 1b3a60949a Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb 2011-01-16 19:25:01 -08:00
Jeff Brown aeef56492e am 5cdf0752: Merge "Support non-rectangular input regions." into honeycomb
* commit '5cdf07524132722e0db69db1ca8dcaf3f0073265':
  Support non-rectangular input regions.
2011-01-16 19:24:17 -08:00
Jeff Brown 3175ea45e3 Merge "Support non-rectangular input regions." into honeycomb 2011-01-16 19:22:01 -08:00
Dianne Hackborn 9bc1802cfb am 805fd7ee: Add API to get path to OBBs.
* commit '805fd7ee0e5dc2939e85c84f78d9890a51982bc0':
  Add API to get path to OBBs.
2011-01-16 18:47:55 -08:00
Jamie Gennis e796979687 am cf18c478: Merge "Implement SurfaceTexture frame-available callback." into honeycomb
* commit 'cf18c4788af740773c9b2720a1c4ed5f45454b8e':
  Implement SurfaceTexture frame-available callback.
2011-01-16 18:17:34 -08:00
Jamie Gennis 5b6e1d61e6 Merge "Implement SurfaceTexture frame-available callback." into honeycomb 2011-01-16 18:15:36 -08:00
Jamie Gennis ca3de5b384 am 41424ade: Merge "Fix SurfaceTexture transform matrix." into honeycomb
* commit '41424adec8382af9064baf1d8bde29d7349a6155':
  Fix SurfaceTexture transform matrix.
2011-01-16 18:15:32 -08:00
Mathias Agopian e2e18b4d93 am 84d36f0a: Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb
* commit '84d36f0a382d79f00fdd896f955a579bf9e160d9':
  egl: fix GetProcAddress for EGLimage extensions
2011-01-16 18:15:29 -08:00
Jamie Gennis db088f67b5 Merge "Fix SurfaceTexture transform matrix." into honeycomb 2011-01-16 18:14:07 -08:00
Mathias Agopian e41ae626be Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb 2011-01-16 18:13:19 -08:00
Michael I. Gold 609bb4dbf0 egl: fix GetProcAddress for EGLimage extensions
Return wrappers from GetProcAddress for glEGLImageTargetTexture2DOES
and glEGLImageTargetRenderbufferStorageOES which unwrap the EGLimage
handle before calling through to the implementation.

Change-Id: I2f5b180ab3ccdb28a4f510a2bd8c2eee941a84df
2011-01-16 18:12:04 -08:00
Mathias Agopian 6d57404bbe am f90633a0: Merge "egl: expose EGLimage extensions" into honeycomb
* commit 'f90633a07edf2ed058c054ec4cb82d7d1b3a8666':
  egl: expose EGLimage extensions
2011-01-16 18:05:32 -08:00
Mathias Agopian 237827387d Merge "egl: expose EGLimage extensions" into honeycomb 2011-01-16 18:03:55 -08:00
Michael I. Gold ca41e36266 egl: expose EGLimage extensions
Add EGL_KHR_gl_texture_cubemap_image and EGL_KHR_gl_renderbuffer_image
to the static EGL extension string since these require no new APIs
beyond what is already required.

Change-Id: I2d1fde86b19bb9eee46b3b977f51784a17cfcc3c
2011-01-16 18:02:52 -08:00
Jim Miller e9e7032595 am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
* commit '057d9f16f793c3796751913ad2eeb12582a7626b':
  Fix 3342063: Correctly update StatusView when battery changes.
2011-01-16 17:52:39 -08:00
Jim Miller de5527d919 Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb 2011-01-16 17:51:04 -08:00
Jason Sams 0c6b2134e0 am 7f13a850: Merge "Add some error checking." into honeycomb
* commit '7f13a850ddb420015d953492b093c762a4ec3050':
  Add some error checking.
2011-01-16 17:48:41 -08:00
Jason Sams 3f5c218022 Merge "Add some error checking." into honeycomb 2011-01-16 17:46:16 -08:00
Adam Cohen 0e72d58346 am 50204584: Fixing StackView bug (Issue: 3321912)
* commit '502045849f760f018f662d752020aef32d4cecd9':
  Fixing StackView bug (Issue: 3321912)
2011-01-16 17:41:38 -08:00
Jeff Brown b95e327d30 am 2d1072ed: Merge "Flush Binder commands in ndk looper." into honeycomb
* commit '2d1072ed7e5a263e7ddf4923d46538fbb25caf4f':
  Flush Binder commands in ndk looper.
2011-01-16 17:39:33 -08:00
Jeff Brown 3b86887421 Merge "Flush Binder commands in ndk looper." into honeycomb 2011-01-16 17:37:34 -08:00
Patrick Dubroy 77e861c180 am e7218240: Merge "Add a method for clearing all animations on a thread." into honeycomb
* commit 'e7218240ab1e52de0f7d16c72b0a5b87679427a1':
  Add a method for clearing all animations on a thread.
2011-01-16 17:31:35 -08:00
Adam Powell c42d8d0c4b am 70359ce2: Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb
* commit '70359ce27d39222ef023078e5a461aee28bb7be1':
  Fix bug 3050138 - Action bar does not display correctly when many action items are added
2011-01-16 17:31:32 -08:00
Mathias Agopian bdff8c75a6 am 8a852406: Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb
* commit '8a852406428ea283fef1c860bc13cb5b5bfbc7ac':
  Add logs when taking a screenshot to help tracking issue 3361121
2011-01-16 17:29:29 -08:00
Jamie Gennis c4d4aeab52 Implement SurfaceTexture frame-available callback.
This change implements the onFrameAvailable callback for the
SurfaceTexture java class.  It includes the C++ SurfaceTexture code as
well as the JNI and Java code to enable the callback.

Change-Id: Ifd8b8e7ad46ee70cba6da1c2e96dab8045d1ea30
2011-01-16 17:28:39 -08:00
Patrick Dubroy 718365bdc3 Merge "Add a method for clearing all animations on a thread." into honeycomb 2011-01-16 17:28:11 -08:00
Adam Powell a8391d313b Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb 2011-01-16 17:28:05 -08:00
Mathias Agopian 685387e7ab Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb 2011-01-16 17:26:30 -08:00
Mathias Agopian c1d1b0d9b7 Add logs when taking a screenshot to help tracking issue 3361121
Change-Id: I61d1e072ebe7061ee1d7255f6121b684e2923d1b
2011-01-16 17:25:26 -08:00
Adam Cohen 91220cbdc7 am 67e8915c: Merge "Fixing StackView bugs:" into honeycomb
* commit '67e8915c94b4e841c80ce034c212d4f0cf9a5098':
  Fixing StackView bugs:
2011-01-16 17:10:22 -08:00
Adam Cohen 60534afc2b Merge "Fixing StackView bugs:" into honeycomb 2011-01-16 17:08:40 -08:00
Joe Onorato d5cda26e37 am 08a555ba: Merge "Remove a bunch of logging." into honeycomb
* commit '08a555bac48d8192be2b052bcf2ac4090476612e':
  Remove a bunch of logging.
2011-01-16 17:03:20 -08:00
Joe Onorato 62298eb671 Merge "Remove a bunch of logging." into honeycomb 2011-01-16 17:01:14 -08:00
Kenny Root 761d4a9384 am fc28f412: Merge "Put externalSize measurements in PackageStats" into honeycomb
* commit 'fc28f412b54d811c61d4997ea94c79875f9ad015':
  Put externalSize measurements in PackageStats
2011-01-16 16:59:24 -08:00
Jeff Brown 3f08bdae32 am 3392b8e2: am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
* commit '3392b8e23e7eb0275071af621802ed04c829c911':
  Flush Binder commands in ndk looper.
2011-01-16 16:58:57 -08:00
Kenny Root 36177e46d9 Merge "Put externalSize measurements in PackageStats" into honeycomb 2011-01-16 16:56:44 -08:00
Jim Miller e96c2def82 resolved conflicts for merge of 578e73da to honeycomb-plus-aosp
Change-Id: I334ae5382220a84881521885b6e3c3991fd8bbb0
2011-01-16 16:55:28 -08:00
Dharmaray Kundargi b6783164e8 integrate videoeditor preview player.
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
2011-01-16 16:43:20 -08:00