OSDN Git Service

android-x86/frameworks-native.git
13 years agoam 2e4b9985: am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area...
Jim Miller [Sat, 29 Jan 2011 00:28:55 +0000 (16:28 -0800)]
am 2e4b9985: am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb

* commit '2e4b9985dba629eac5662c32a6684fb7b880aeff':
  Fix 3403858: Remove lock icons from status1 area.

13 years agoam ec5de087: am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views...
Chet Haase [Sat, 29 Jan 2011 00:26:43 +0000 (16:26 -0800)]
am ec5de087: am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb

* commit 'ec5de0874fb32137c117461e5680c83422fba975':
  Fixed LayoutTransition bug moving multiple views

13 years agoam 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
Jim Miller [Sat, 29 Jan 2011 00:26:05 +0000 (16:26 -0800)]
am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb

* commit '6354dd0b3e507b2afebc5ba41cd57866ade5ba94':
  Fix 3403858: Remove lock icons from status1 area.

13 years agoam 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
Chet Haase [Sat, 29 Jan 2011 00:23:45 +0000 (16:23 -0800)]
am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb

* commit '691d43c35fb953c2f70830d3ebd890a43b54cae3':
  Fixed LayoutTransition bug moving multiple views

13 years agoMerge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
Jim Miller [Sat, 29 Jan 2011 00:21:38 +0000 (16:21 -0800)]
Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb

13 years agoMerge "Fixed LayoutTransition bug moving multiple views" into honeycomb
Chet Haase [Sat, 29 Jan 2011 00:19:32 +0000 (16:19 -0800)]
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb

13 years agoMerge "Protected surface API"
Glenn Kasten [Fri, 28 Jan 2011 23:18:43 +0000 (15:18 -0800)]
Merge "Protected surface API"

13 years agoam 6a18f6e2: (-s ours) am 0982dc64: Merge "Import revised translations. DO NOT MERGE...
Eric Fischer [Fri, 28 Jan 2011 23:13:50 +0000 (15:13 -0800)]
am 6a18f6e2: (-s ours) am 0982dc64: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '6a18f6e289f1bd6cdb4a3b73015935fac1c9b11d':
  Import revised translations.  DO NOT MERGE

13 years agoam 0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 23:11:14 +0000 (15:11 -0800)]
am 0982dc64: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '0982dc6488a921d9d54d23b9180a9acf33c61526':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 23:09:16 +0000 (15:09 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoam d1bde71a: am 20af1c57: Merge "Correct font size for notifications & control panel...
Justin Ho [Fri, 28 Jan 2011 23:07:37 +0000 (15:07 -0800)]
am d1bde71a: am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb

* commit 'd1bde71ad917218949555724722cdef7139d5ac9':
  Correct font size for notifications & control panel.

13 years agoam 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb
Justin Ho [Fri, 28 Jan 2011 23:05:07 +0000 (15:05 -0800)]
am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb

* commit '20af1c57de9651b93a35b67418263b88bc83f3e4':
  Correct font size for notifications & control panel.

13 years agoMerge "Correct font size for notifications & control panel." into honeycomb
Justin Ho [Fri, 28 Jan 2011 23:02:55 +0000 (15:02 -0800)]
Merge "Correct font size for notifications & control panel." into honeycomb

13 years agoam 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
Brian Muramatsu [Fri, 28 Jan 2011 22:55:31 +0000 (14:55 -0800)]
am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb

* commit '910be3e855738eab783f2e280b76dcef90a841ec':
  Fix TextUtils#commaEllipsize

13 years agoam 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
Brian Muramatsu [Fri, 28 Jan 2011 22:53:07 +0000 (14:53 -0800)]
am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb

* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
  Fix TextUtils#commaEllipsize

13 years agoMerge "Fix TextUtils#commaEllipsize" into honeycomb
Brian Muramatsu [Fri, 28 Jan 2011 22:51:10 +0000 (14:51 -0800)]
Merge "Fix TextUtils#commaEllipsize" into honeycomb

13 years agoam 571a2c97: am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug...
Romain Guy [Fri, 28 Jan 2011 22:22:29 +0000 (14:22 -0800)]
am 571a2c97: am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb

* commit '571a2c971b9691f3ace247bf2110efccc782f3ba':
  Prevent crash when detaching a SurfaceView. Bug #3400461

13 years agoam b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into...
Romain Guy [Fri, 28 Jan 2011 22:20:01 +0000 (14:20 -0800)]
am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb

* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
  Prevent crash when detaching a SurfaceView. Bug #3400461

13 years agoam a461269d: am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error...
Jamie Gennis [Fri, 28 Jan 2011 22:18:09 +0000 (14:18 -0800)]
am a461269d: am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb

* commit 'a461269d458b29f1e44ba66f6f4ef6b711013705':
  Quiet the SurfaceFlingerClient dequeueBuffer error.

13 years agoMerge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb
Romain Guy [Fri, 28 Jan 2011 22:17:45 +0000 (14:17 -0800)]
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb

13 years agoam 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
Jamie Gennis [Fri, 28 Jan 2011 22:15:44 +0000 (14:15 -0800)]
am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb

* commit '2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
  Quiet the SurfaceFlingerClient dequeueBuffer error.

13 years agoMerge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
Jamie Gennis [Fri, 28 Jan 2011 22:12:57 +0000 (14:12 -0800)]
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb

13 years agoam 06cedc1c: am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using...
Gilles Debunne [Fri, 28 Jan 2011 22:12:38 +0000 (14:12 -0800)]
am 06cedc1c: am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb

* commit '06cedc1c4a0587389bb1eb360df62b1ec1964bd1':
  Fix for TextView's error popup behavior when using soft keyboard.

13 years agoam d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard...
Gilles Debunne [Fri, 28 Jan 2011 22:10:08 +0000 (14:10 -0800)]
am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb

* commit 'd11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
  Fix for TextView's error popup behavior when using soft keyboard.

13 years agoMerge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
Gilles Debunne [Fri, 28 Jan 2011 22:07:12 +0000 (14:07 -0800)]
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb

13 years agoam 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable...
Adam Powell [Fri, 28 Jan 2011 22:03:31 +0000 (14:03 -0800)]
am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb

* commit '406de58e48378bca9ea7e75c61039d243ea81855':
  Fix bug 3399992 - Make ActionBar menu text styleable

13 years agoam 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
Adam Powell [Fri, 28 Jan 2011 22:01:06 +0000 (14:01 -0800)]
am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb

* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
  Fix bug 3399992 - Make ActionBar menu text styleable

13 years agoMerge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
Adam Powell [Fri, 28 Jan 2011 21:58:28 +0000 (13:58 -0800)]
Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb

13 years agoam d6874a10: am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
Joe Onorato [Fri, 28 Jan 2011 21:45:51 +0000 (13:45 -0800)]
am d6874a10: am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb

* commit 'd6874a105ee584b1dc60aae2f2af7c78ee875114':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.

13 years agoam b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible...
Joe Onorato [Fri, 28 Jan 2011 21:45:42 +0000 (13:45 -0800)]
am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb

* commit 'b940659f415d536966f1bb8af4d5281efa3a7f7a':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.

13 years agoam cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
Joe Onorato [Fri, 28 Jan 2011 21:43:22 +0000 (13:43 -0800)]
am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb

* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.

13 years agoam 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through...
Joe Onorato [Fri, 28 Jan 2011 21:43:17 +0000 (13:43 -0800)]
am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb

* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.

13 years agoMerge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
Joe Onorato [Fri, 28 Jan 2011 21:40:45 +0000 (13:40 -0800)]
Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb

* changes:
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.

13 years agoMerge "Plumb whether an input view is actually visible or not through from the IME...
Joe Onorato [Fri, 28 Jan 2011 21:40:28 +0000 (13:40 -0800)]
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb

13 years agoam 8691b724: am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom...
Dianne Hackborn [Fri, 28 Jan 2011 20:48:15 +0000 (12:48 -0800)]
am 8691b724: am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb

* commit '8691b7243d40d5ef0ab94b8d5f204635d36bf1c4':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader

13 years agoam 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader...
Dianne Hackborn [Fri, 28 Jan 2011 20:46:51 +0000 (12:46 -0800)]
am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb

* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader

13 years agoMerge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 20:44:52 +0000 (12:44 -0800)]
Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb

13 years agoam 412e6f7e: am 361d6148: Merge "LayoutLib: Update with the new resource map APIs...
Xavier Ducrohet [Fri, 28 Jan 2011 20:44:01 +0000 (12:44 -0800)]
am 412e6f7e: am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb

* commit '412e6f7e294aa56a2c4532155cde6fa9963dbbf0':
  LayoutLib: Update with the new resource map APIs.

13 years agoam 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
Xavier Ducrohet [Fri, 28 Jan 2011 20:40:30 +0000 (12:40 -0800)]
am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb

* commit '361d614822fcda456ba80f166e5d97447adb7e79':
  LayoutLib: Update with the new resource map APIs.

13 years agoMerge "LayoutLib: Update with the new resource map APIs." into honeycomb
Xavier Ducrohet [Fri, 28 Jan 2011 20:38:40 +0000 (12:38 -0800)]
Merge "LayoutLib: Update with the new resource map APIs." into honeycomb

13 years agoam 9bd1d320: am f0ca959b: Merge "Fix overlapping app icon & info in notifications...
Daniel Sandler [Fri, 28 Jan 2011 20:22:38 +0000 (12:22 -0800)]
am 9bd1d320: am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb

* commit '9bd1d3204f4048b902d0fdf0ea0809f29eddeafd':
  Fix overlapping app icon & info in notifications with large icons.

13 years agoam f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons...
Daniel Sandler [Fri, 28 Jan 2011 20:20:11 +0000 (12:20 -0800)]
am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb

* commit 'f0ca959b02cb9e81c116f7dece0bc345fb54de0c':
  Fix overlapping app icon & info in notifications with large icons.

13 years agoMerge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
Daniel Sandler [Fri, 28 Jan 2011 20:18:11 +0000 (12:18 -0800)]
Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb

13 years agoQuiet the SurfaceFlingerClient dequeueBuffer error.
Jamie Gennis [Fri, 28 Jan 2011 20:03:52 +0000 (12:03 -0800)]
Quiet the SurfaceFlingerClient dequeueBuffer error.

This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one.  Currently, an error
is returned in that case, and this change just prevents that error from
being logged.  In the future this will be fixed to not return an error
in that case.

Bug: 3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a

13 years agoam 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more...
Andreas Huber [Fri, 28 Jan 2011 19:53:50 +0000 (11:53 -0800)]
am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb

* commit '35a1f771759459fc6c9b355d548c5b97cd50e110':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"

13 years agoam 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track...
Andreas Huber [Fri, 28 Jan 2011 19:51:16 +0000 (11:51 -0800)]
am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb

* commit '79c4648597dab2b7786c8f067896ab66abe190de':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"

13 years agoMerge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs...
Andreas Huber [Fri, 28 Jan 2011 19:49:03 +0000 (11:49 -0800)]
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb

13 years agoam bcb14a20: am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness...
Daniel Sandler [Fri, 28 Jan 2011 19:26:05 +0000 (11:26 -0800)]
am bcb14a20: am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb

* commit 'bcb14a203561c3782ebd6515650cc7001318efb6':
  Allow taps to once again penetrate the darkness.

13 years agoam 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb
Daniel Sandler [Fri, 28 Jan 2011 19:23:47 +0000 (11:23 -0800)]
am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb

* commit '2ded7ef444d4e089e0ce4874c791f19ec198fc36':
  Allow taps to once again penetrate the darkness.

13 years agoMerge "Allow taps to once again penetrate the darkness." into honeycomb
Daniel Sandler [Fri, 28 Jan 2011 19:21:27 +0000 (11:21 -0800)]
Merge "Allow taps to once again penetrate the darkness." into honeycomb

13 years agoam 3b1561a1: am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb
Gilles Debunne [Fri, 28 Jan 2011 19:04:36 +0000 (11:04 -0800)]
am 3b1561a1: am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb

* commit '3b1561a18c466c23e9c5a3c3297bfc97e881c829':
  Fix for an IOOBoundsException in Paint.

13 years agoam e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb
Gilles Debunne [Fri, 28 Jan 2011 19:02:21 +0000 (11:02 -0800)]
am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb

* commit 'e1df07fc5a88da0242a6ade054423ec464c5318f':
  Fix for an IOOBoundsException in Paint.

13 years agoMerge "Fix for an IOOBoundsException in Paint." into honeycomb
Gilles Debunne [Fri, 28 Jan 2011 18:58:53 +0000 (10:58 -0800)]
Merge "Fix for an IOOBoundsException in Paint." into honeycomb

13 years agoam c49283e7: am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into...
Jamie Gennis [Fri, 28 Jan 2011 18:46:56 +0000 (10:46 -0800)]
am c49283e7: am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb

* commit 'c49283e7aae0f4f00dc8337d2b98addc01abdd8f':
  Add docs about threading to SurfaceTexture.

13 years agoam 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb
Jamie Gennis [Fri, 28 Jan 2011 18:44:44 +0000 (10:44 -0800)]
am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb

* commit '3c0f91b0e1312287a271ba890d52cdb8bb75e52d':
  Add docs about threading to SurfaceTexture.

13 years agoMerge "Add docs about threading to SurfaceTexture." into honeycomb
Jamie Gennis [Fri, 28 Jan 2011 18:42:53 +0000 (10:42 -0800)]
Merge "Add docs about threading to SurfaceTexture." into honeycomb

13 years agoam f53e3155: am e891a115: Merge "Only send a direction key if we are not in touch...
Leon Scroggins [Fri, 28 Jan 2011 18:36:34 +0000 (10:36 -0800)]
am f53e3155: am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb

* commit 'f53e31551aeca325216e72e76d616f06c1fc14f9':
  Only send a direction key if we are not in touch mode.

13 years agoam e891a115: Merge "Only send a direction key if we are not in touch mode." into...
Leon Scroggins [Fri, 28 Jan 2011 18:34:14 +0000 (10:34 -0800)]
am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb

* commit 'e891a115a01d377dc17c0dd658ba23fb5d033e23':
  Only send a direction key if we are not in touch mode.

13 years agoMerge "Only send a direction key if we are not in touch mode." into honeycomb
Leon Scroggins [Fri, 28 Jan 2011 18:32:35 +0000 (10:32 -0800)]
Merge "Only send a direction key if we are not in touch mode." into honeycomb

13 years agoam 97908283: am fe38b7b7: Merge "Fix artifact with clipped webview content" into...
Chet Haase [Fri, 28 Jan 2011 18:20:53 +0000 (10:20 -0800)]
am 97908283: am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb

* commit '97908283c8c7f162bf584e2ad769dc2f6b5061aa':
  Fix artifact with clipped webview content

13 years agoam fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb
Chet Haase [Fri, 28 Jan 2011 18:18:39 +0000 (10:18 -0800)]
am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb

* commit 'fe38b7b79325782f682365ec9d1b8fe2932eec78':
  Fix artifact with clipped webview content

13 years agoMerge "Fix artifact with clipped webview content" into honeycomb
Chet Haase [Fri, 28 Jan 2011 18:16:54 +0000 (10:16 -0800)]
Merge "Fix artifact with clipped webview content" into honeycomb

13 years agoam f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb
Robert Greenwalt [Fri, 28 Jan 2011 17:54:04 +0000 (09:54 -0800)]
am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb

* commit 'f7784876ed2d731fae9ab8a10119f558a9adf8d7':
  Fix data network type notifications.

13 years agoam b8498f1d: Merge "Fix data network type notifications." into honeycomb
Robert Greenwalt [Fri, 28 Jan 2011 17:51:34 +0000 (09:51 -0800)]
am b8498f1d: Merge "Fix data network type notifications." into honeycomb

* commit 'b8498f1dcf0b4e866c940da482930789cd6554c5':
  Fix data network type notifications.

13 years agoMerge "Fix data network type notifications." into honeycomb
Robert Greenwalt [Fri, 28 Jan 2011 17:48:30 +0000 (09:48 -0800)]
Merge "Fix data network type notifications." into honeycomb

13 years agoam 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP....
Andreas Huber [Fri, 28 Jan 2011 17:43:37 +0000 (09:43 -0800)]
am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb

* commit '970436ee42bad03940a73666f8150a28c5789713':
  More robust parsing of NPT time ranges in RTSP.

13 years agoam b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
Andreas Huber [Fri, 28 Jan 2011 17:41:11 +0000 (09:41 -0800)]
am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb

* commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4':
  More robust parsing of NPT time ranges in RTSP.

13 years agoMerge "More robust parsing of NPT time ranges in RTSP." into honeycomb
Andreas Huber [Fri, 28 Jan 2011 17:38:50 +0000 (09:38 -0800)]
Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb

13 years agoam e5da4b74: am 47db84cc: New stat_notify icons
Justin Ho [Fri, 28 Jan 2011 17:28:17 +0000 (09:28 -0800)]
am e5da4b74: am 47db84cc: New stat_notify icons

* commit 'e5da4b74d4f4ba5fea63c4608b702d89f433b94c':
  New stat_notify icons

13 years agoam 47db84cc: New stat_notify icons
Justin Ho [Fri, 28 Jan 2011 17:25:32 +0000 (09:25 -0800)]
am 47db84cc: New stat_notify icons

* commit '47db84cca867c5efdd4760cdf451a9c402097668':
  New stat_notify icons

13 years agoam 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp...
Robert Greenwalt [Fri, 28 Jan 2011 17:22:01 +0000 (09:22 -0800)]
am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
  Update networktype before sending state change.

13 years agoMerge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycom...
Robert Greenwalt [Fri, 28 Jan 2011 17:08:00 +0000 (09:08 -0800)]
Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp

13 years agoresolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
Robert Greenwalt [Fri, 28 Jan 2011 17:06:30 +0000 (09:06 -0800)]
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp

Change-Id: Ib9d24c211461329955288180978a7c5d383bba75

13 years agoProtected surface API
Glenn Kasten [Wed, 19 Jan 2011 23:27:27 +0000 (15:27 -0800)]
Protected surface API

To be used by DRM framework, implemented by display HAL

Change-Id: I054a07a94f4d5dbe792f3a597e2e49a100d90eb2

13 years agoam 306e96c0: am c38b7c82: Merge "Implement the double tap to zoom animation with...
Ben Murdoch [Fri, 28 Jan 2011 10:42:39 +0000 (02:42 -0800)]
am 306e96c0: am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb

* commit '306e96c0dd931c9dd83e3d580c5b79141d093646':
  Implement the double tap to zoom animation with HW accleration.

13 years agoam c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration...
Ben Murdoch [Fri, 28 Jan 2011 10:35:22 +0000 (02:35 -0800)]
am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb

* commit 'c38b7c820af52c4d5f6f51c750136d18d9897e5e':
  Implement the double tap to zoom animation with HW accleration.

13 years agoMerge "Implement the double tap to zoom animation with HW accleration." into honeycomb
Ben Murdoch [Fri, 28 Jan 2011 10:27:38 +0000 (02:27 -0800)]
Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb

13 years agoam bb609471: am 256a09b2: Merge "Fix issue #3392073: At times soft keyboard comes...
Dianne Hackborn [Fri, 28 Jan 2011 06:53:20 +0000 (22:53 -0800)]
am bb609471: am 256a09b2: Merge "Fix issue #3392073: At times soft keyboard comes up in..." into honeycomb

* commit 'bb6094718b08e7fe2054b7260a85baae635afe48':
  Fix issue #3392073: At times soft keyboard comes up in...

13 years agoam f1a9ab26: am d23316bc: Merge "Maybe fix issue #3358322: Status and nav bar died...
Dianne Hackborn [Fri, 28 Jan 2011 06:53:13 +0000 (22:53 -0800)]
am f1a9ab26: am d23316bc: Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb

* commit 'f1a9ab2673a2b5e6f684f7ceced177e3fc749ee7':
  Maybe fix issue #3358322: Status and nav bar died while watching youtube

13 years agoam 256a09b2: Merge "Fix issue #3392073: At times soft keyboard comes up in..." into...
Dianne Hackborn [Fri, 28 Jan 2011 06:50:56 +0000 (22:50 -0800)]
am 256a09b2: Merge "Fix issue #3392073: At times soft keyboard comes up in..." into honeycomb

* commit '256a09b2fa5cc06775818428de771c7957403452':
  Fix issue #3392073: At times soft keyboard comes up in...

13 years agoam d23316bc: Merge "Maybe fix issue #3358322: Status and nav bar died while watching...
Dianne Hackborn [Fri, 28 Jan 2011 06:50:52 +0000 (22:50 -0800)]
am d23316bc: Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb

* commit 'd23316bc8b49f269e5adcc91eae5698549faa0a3':
  Maybe fix issue #3358322: Status and nav bar died while watching youtube

13 years agoam 6a11185b: am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme...
Dianne Hackborn [Fri, 28 Jan 2011 06:50:45 +0000 (22:50 -0800)]
am 6a11185b: am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb

* commit '6a11185b9293151cb3c12c296cf989ea0e7cb898':
  Fix issue #3398767: Need translucent holo theme

13 years agoMerge "Fix issue #3392073: At times soft keyboard comes up in..." into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 06:48:58 +0000 (22:48 -0800)]
Merge "Fix issue #3392073: At times soft keyboard comes up in..." into honeycomb

13 years agoam c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 06:48:32 +0000 (22:48 -0800)]
am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb

* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
  Fix issue #3398767: Need translucent holo theme

13 years agoMerge "Maybe fix issue #3358322: Status and nav bar died while watching youtube"...
Dianne Hackborn [Fri, 28 Jan 2011 06:47:50 +0000 (22:47 -0800)]
Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb

13 years agoMerge "Fix issue #3398767: Need translucent holo theme" into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 06:46:44 +0000 (22:46 -0800)]
Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb

13 years agoam 24c29867: am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
Romain Guy [Fri, 28 Jan 2011 06:35:13 +0000 (22:35 -0800)]
am 24c29867: am d0b54a73: Merge "Add more debug info for profiling." into honeycomb

* commit '24c29867a6851ce2c692a0ea61918d37dcb8e8e0':
  Add more debug info for profiling.

13 years agoam d0b54a73: Merge "Add more debug info for profiling." into honeycomb
Romain Guy [Fri, 28 Jan 2011 06:33:02 +0000 (22:33 -0800)]
am d0b54a73: Merge "Add more debug info for profiling." into honeycomb

* commit 'd0b54a73941aa5541ed1adc48f6739bda132970b':
  Add more debug info for profiling.

13 years agoMerge "Add more debug info for profiling." into honeycomb
Romain Guy [Fri, 28 Jan 2011 06:30:57 +0000 (22:30 -0800)]
Merge "Add more debug info for profiling." into honeycomb

13 years agoFix issue #3392073: At times soft keyboard comes up in...
Dianne Hackborn [Fri, 28 Jan 2011 03:37:40 +0000 (19:37 -0800)]
Fix issue #3392073: At times soft keyboard comes up in...

...gallery while attaching picture to gmail message

In various places we could block switching the IME target incorrectly.

Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa

13 years agoam 3e232f1c: am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update...
Jason Sams [Fri, 28 Jan 2011 05:28:22 +0000 (21:28 -0800)]
am 3e232f1c: am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb

* commit '3e232f1c59eb95a7d3b5b3ea411a383b7a8f1b5b':
  Fix another barrier bug 3333866 Atomically update put.

13 years agoam 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into...
Jason Sams [Fri, 28 Jan 2011 05:26:15 +0000 (21:26 -0800)]
am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb

* commit '386ef6da5a95243b4a55b3f760621260e20a5e39':
  Fix another barrier bug 3333866 Atomically update put.

13 years agoMerge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
Jason Sams [Fri, 28 Jan 2011 05:24:00 +0000 (21:24 -0800)]
Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb

13 years agoam aed413a1: am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844...
Adam Cohen [Fri, 28 Jan 2011 04:08:35 +0000 (20:08 -0800)]
am aed413a1: am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb

* commit 'aed413a18cac6b39d5e88c53b08bdb019ebb6d8d':
  Fixing static StackView scenario (Issue: 3399844)

13 years agoam e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
Adam Cohen [Fri, 28 Jan 2011 04:06:09 +0000 (20:06 -0800)]
am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb

* commit 'e31ecf61042171242e6f31f22df7691c40f189b2':
  Fixing static StackView scenario (Issue: 3399844)

13 years agoam fb80d648: am 17945d0e: Merge "Update InputMethodPanel when locale was changed...
satok [Fri, 28 Jan 2011 04:04:31 +0000 (20:04 -0800)]
am fb80d648: am 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb

* commit 'fb80d648e2164fac75d41d6024a4d43137c0561f':
  Update InputMethodPanel when locale was changed.

13 years agoMerge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
Adam Cohen [Fri, 28 Jan 2011 04:04:21 +0000 (20:04 -0800)]
Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb

13 years agoam 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb
satok [Fri, 28 Jan 2011 04:02:04 +0000 (20:02 -0800)]
am 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb

* commit '17945d0e05c8a4b0aa59032bc054b942c20d9472':
  Update InputMethodPanel when locale was changed.

13 years agoMerge "Update InputMethodPanel when locale was changed." into honeycomb
satok [Fri, 28 Jan 2011 04:00:43 +0000 (20:00 -0800)]
Merge "Update InputMethodPanel when locale was changed." into honeycomb

13 years agoam 6059c395: am 55f8f121: Merge "Correctly free resouces bound to scripts when the...
Stephen Hines [Fri, 28 Jan 2011 03:44:36 +0000 (19:44 -0800)]
am 6059c395: am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb

* commit '6059c3955d739ab5fad15f9bf6bb6f743a9b5ac2':
  Correctly free resouces bound to scripts when the scripts are deleted.