OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "TextView uses WordIterator to select words."
Gilles Debunne [Fri, 29 Apr 2011 16:51:46 +0000 (09:51 -0700)]
Merge "TextView uses WordIterator to select words."

13 years agoMerge "Turn on SIP phone support by default."
Hung-ying Tyan [Fri, 29 Apr 2011 07:34:36 +0000 (00:34 -0700)]
Merge "Turn on SIP phone support by default."

13 years agoMerge "get rid of dependency on copybit HAL module"
Mathias Agopian [Fri, 29 Apr 2011 03:14:54 +0000 (20:14 -0700)]
Merge "get rid of dependency on copybit HAL module"

13 years agoget rid of dependency on copybit HAL module
Mathias Agopian [Fri, 29 Apr 2011 02:50:21 +0000 (19:50 -0700)]
get rid of dependency on copybit HAL module

Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428

13 years agoMerge "Fix the build."
Romain Guy [Fri, 29 Apr 2011 02:42:56 +0000 (19:42 -0700)]
Merge "Fix the build."

13 years agoMerge "This file should not be here."
Romain Guy [Fri, 29 Apr 2011 01:55:58 +0000 (18:55 -0700)]
Merge "This file should not be here."

13 years agoThis file should not be here.
Romain Guy [Fri, 29 Apr 2011 01:55:29 +0000 (18:55 -0700)]
This file should not be here.

Change-Id: I0ccb41869303fa765ed13763bf17c7e0ee9f036e

13 years agoMerge "New widget: TextureView Bug #4343984"
Romain Guy [Fri, 29 Apr 2011 01:47:01 +0000 (18:47 -0700)]
Merge "New widget: TextureView Bug #4343984"

13 years agoMerge "Use passive provider for location based country detection"
Daisuke Miyakawa [Thu, 28 Apr 2011 23:19:23 +0000 (16:19 -0700)]
Merge "Use passive provider for location based country detection"

13 years agoMerge "TextView's baseline is correctly computed for empty text."
Gilles Debunne [Thu, 28 Apr 2011 22:48:05 +0000 (15:48 -0700)]
Merge "TextView's baseline is correctly computed for empty text."

13 years agoMerge "libgui: enable tests in the 'tests' build."
Jamie Gennis [Thu, 28 Apr 2011 22:03:56 +0000 (15:03 -0700)]
Merge "libgui: enable tests in the 'tests' build."

13 years agoam c932a56a: am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected...
Scott Main [Thu, 28 Apr 2011 21:34:29 +0000 (14:34 -0700)]
am c932a56a: am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

* commit 'c932a56ac84d680fd8f38c913c7e76105cfc0597':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430

13 years agoam d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic...
Scott Main [Thu, 28 Apr 2011 21:32:02 +0000 (14:32 -0700)]
am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

* commit 'd7f739b13e0336d6dd02df18d16a73636a795c3f':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430

13 years agoam 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring...
Scott Main [Thu, 28 Apr 2011 21:25:22 +0000 (14:25 -0700)]
am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

* commit '114ba198f5ae19fc0a632e18369a912c54a0c44e':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430

13 years agoam c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug...
Scott Main [Thu, 28 Apr 2011 21:21:46 +0000 (14:21 -0700)]
am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

* commit 'c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430

13 years agoMerge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into...
Scott Main [Thu, 28 Apr 2011 21:08:57 +0000 (14:08 -0700)]
Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

13 years agoam 418e486a: am a68a61df: Merge "Telephony: Data availability indication upon records...
Wink Saville [Thu, 28 Apr 2011 20:55:59 +0000 (13:55 -0700)]
am 418e486a: am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

* commit '418e486a1cae97fccaa4da0128f255685d9a7e12':
  Telephony: Data availability indication upon records loaded.

13 years agoam a68a61df: Merge "Telephony: Data availability indication upon records loaded....
Wink Saville [Thu, 28 Apr 2011 20:54:14 +0000 (13:54 -0700)]
am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

* commit 'a68a61dfe37969426c535d076a20181155493226':
  Telephony: Data availability indication upon records loaded.

13 years agoam f49a96aa: am 05fcd239: Merge "Telephony: Corrections to signal strength values...
Wink Saville [Thu, 28 Apr 2011 20:54:04 +0000 (13:54 -0700)]
am f49a96aa: am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

* commit 'f49a96aa7683bba0536a68f2c043905c6c5f92fb':
  Telephony: Corrections to signal strength values.

13 years agoam 5bc9d478: am 379cbb1d: Send STK Service Running RIL Request after sim module is...
Kazuhiro Ondo [Thu, 28 Apr 2011 20:54:01 +0000 (13:54 -0700)]
am 5bc9d478: am 379cbb1d: Send STK Service Running RIL Request after sim module is ready

* commit '5bc9d478517739bdcd79951e865f26481b79ddfc':
  Send STK Service Running RIL Request after sim module is ready

13 years agoam 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:52:28 +0000 (13:52 -0700)]
am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

* commit '05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
  Telephony: Corrections to signal strength values.

13 years agoam 379cbb1d: Send STK Service Running RIL Request after sim module is ready
Kazuhiro Ondo [Thu, 28 Apr 2011 20:52:26 +0000 (13:52 -0700)]
am 379cbb1d: Send STK Service Running RIL Request after sim module is ready

* commit '379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d':
  Send STK Service Running RIL Request after sim module is ready

13 years agoMerge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:51:31 +0000 (13:51 -0700)]
Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

13 years agoMerge "Telephony: Corrections to signal strength values." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:51:22 +0000 (13:51 -0700)]
Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

13 years agoam 7848b71b: am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable."...
Wink Saville [Thu, 28 Apr 2011 18:55:00 +0000 (11:55 -0700)]
am 7848b71b: am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

* commit '7848b71b4ff0d50030b528db931d5460b2a3e9e8':
  GsmDCT: Reset DataConnection upon APN disable.

13 years agoam e4c7f3ba: am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled...
Wink Saville [Thu, 28 Apr 2011 18:54:57 +0000 (11:54 -0700)]
am e4c7f3ba: am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

* commit 'e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae':
  Remove subclass cast for calls to isDnsCheckDisabled.

13 years agoam 69e830dc: am 8daec83f: Merge "Delay data reconnection after disconnected." into...
Wink Saville [Thu, 28 Apr 2011 18:54:54 +0000 (11:54 -0700)]
am 69e830dc: am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE

* commit '69e830dc31a4f6fc19d8392efede114afd20fe7b':
  Delay data reconnection after disconnected.

13 years agoMerge "Fix RS graphics samples/tests."
Stephen Hines [Thu, 28 Apr 2011 18:54:29 +0000 (11:54 -0700)]
Merge "Fix RS graphics samples/tests."

13 years agoam 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:53:08 +0000 (11:53 -0700)]
am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
  GsmDCT: Reset DataConnection upon APN disable.

13 years agoam 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honey...
Wink Saville [Thu, 28 Apr 2011 18:53:05 +0000 (11:53 -0700)]
am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
  Remove subclass cast for calls to isDnsCheckDisabled.

13 years agoam 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:53:02 +0000 (11:53 -0700)]
am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE

* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
  Delay data reconnection after disconnected.

13 years agoam c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine...
Irfan Sheriff [Thu, 28 Apr 2011 18:52:56 +0000 (11:52 -0700)]
am c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

* commit 'c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
  Define Protocol class for use with StateMachine

13 years agoMerge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:24 +0000 (11:50 -0700)]
Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

13 years agoMerge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:15 +0000 (11:50 -0700)]
Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

13 years agoMerge "Delay data reconnection after disconnected." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:05 +0000 (11:50 -0700)]
Merge "Delay data reconnection after disconnected." into honeycomb-LTE

13 years agoam a60594cb: Fixed bad merge in ViewRoot.java.
Conley Owens [Thu, 28 Apr 2011 18:49:43 +0000 (11:49 -0700)]
am a60594cb: Fixed bad merge in ViewRoot.java.

* commit 'a60594cb1c1399f557a82403f7fc7abb7af55250':
  Fixed bad merge in ViewRoot.java.

13 years agoam 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
Irfan Sheriff [Thu, 28 Apr 2011 18:48:47 +0000 (11:48 -0700)]
am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

* commit '8f87f8389866058a081e601fc0df45a3527a3150':
  Define Protocol class for use with StateMachine

13 years agoam b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translation...
Eric Fischer [Thu, 28 Apr 2011 18:48:43 +0000 (11:48 -0700)]
am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations.  DO NOT MERGE

* commit 'b2149f4a11cddba303674298ef543e76ea11475e':
  Import revised translations.  DO NOT MERGE

13 years agoam 4854f70c: Ignore change since file no longer exists
Conley Owens [Thu, 28 Apr 2011 18:48:25 +0000 (11:48 -0700)]
am 4854f70c: Ignore change since file no longer exists

* commit '4854f70c0881ff44fabd8c261653bd90210bdc22':
  Auto hide virtual keyboard

13 years agoam 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null...
Stephen Hines [Thu, 28 Apr 2011 18:48:18 +0000 (11:48 -0700)]
am 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '5ac02e73c313935b1af8a536e47f74b616986dfe':
  Check setName() for null string + fix rsRand().

13 years agoMerge "Define Protocol class for use with StateMachine" into honeycomb-LTE
Irfan Sheriff [Thu, 28 Apr 2011 18:38:54 +0000 (11:38 -0700)]
Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

13 years agoMerge "Use previous version if version is a codename"
John Reck [Thu, 28 Apr 2011 17:38:50 +0000 (10:38 -0700)]
Merge "Use previous version if version is a codename"

13 years agoam 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 28 Apr 2011 17:25:52 +0000 (10:25 -0700)]
am 1d104476: (-s ours) am a4e7353d: Import revised translations.  DO NOT MERGE

* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Make InputWindow.h's window types align with WindowManager.java's."
Daniel Sandler [Thu, 28 Apr 2011 17:22:49 +0000 (10:22 -0700)]
Merge "Make InputWindow.h's window types align with WindowManager.java's."

13 years agoIgnore change since file no longer exists
Conley Owens [Thu, 28 Apr 2011 17:10:52 +0000 (10:10 -0700)]
Ignore change since file no longer exists

13 years agoMerge "Add dalvik code for forEach."
Jason Sams [Thu, 28 Apr 2011 06:00:40 +0000 (23:00 -0700)]
Merge "Add dalvik code for forEach."

13 years agoMerge "Start implementing control side forEach."
Jason Sams [Thu, 28 Apr 2011 06:00:25 +0000 (23:00 -0700)]
Merge "Start implementing control side forEach."

13 years agoMerge "Unhide camera focus area and metering area API."
Wu-cheng Li [Thu, 28 Apr 2011 04:17:52 +0000 (21:17 -0700)]
Merge "Unhide camera focus area and metering area API."

13 years agoMerge "Fix uninitialized variable in SurfaceTexture"
Mathias Agopian [Thu, 28 Apr 2011 02:01:01 +0000 (19:01 -0700)]
Merge "Fix uninitialized variable in SurfaceTexture"

13 years agoFix uninitialized variable in SurfaceTexture
Mathias Agopian [Thu, 28 Apr 2011 01:57:33 +0000 (18:57 -0700)]
Fix uninitialized variable in SurfaceTexture

Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793

13 years agoam 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()....
Stephen Hines [Thu, 28 Apr 2011 00:38:53 +0000 (17:38 -0700)]
am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '697f8b331bb339e4db716efbb96e2182aac40255':
  Check setName() for null string + fix rsRand().

13 years agoam 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
Stephen Hines [Thu, 28 Apr 2011 00:36:38 +0000 (17:36 -0700)]
am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
  Check setName() for null string + fix rsRand().

13 years agoMerge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
Stephen Hines [Thu, 28 Apr 2011 00:32:40 +0000 (17:32 -0700)]
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

13 years agoMerge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73
Dima Zavin [Thu, 28 Apr 2011 00:13:46 +0000 (17:13 -0700)]
Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73

* changes:
  audioflinger: don't do work in constructor, instead do it in onFirstRef
  audioflinger: enumerate all the possible audio interfaces
  audio/media: convert to using the audio HAL and new audio defs
  libmedia: move AudioParameter out of AudioSystem
  audioflinger: move legacy audio hw/policy out to libhardware_legacy

13 years agoam c4791bd6: Merge commit \'5e3562a5\' into m
Conley Owens [Thu, 28 Apr 2011 00:01:49 +0000 (17:01 -0700)]
am c4791bd6: Merge commit \'5e3562a5\' into m

* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
  onDetachedFromWindow is called before onAttachedToWindow

13 years agoMerge commit '5e3562a5' into m
Conley Owens [Wed, 27 Apr 2011 23:58:24 +0000 (16:58 -0700)]
Merge commit '5e3562a5' into m

Conflicts:
core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87

13 years agoam eedf20c2: Ignore xml change since file no longer exists
Conley Owens [Wed, 27 Apr 2011 23:54:40 +0000 (16:54 -0700)]
am eedf20c2: Ignore xml change since file no longer exists

* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoIgnore xml change since file no longer exists
Conley Owens [Wed, 27 Apr 2011 23:49:07 +0000 (16:49 -0700)]
Ignore xml change since file no longer exists

13 years agoMerge "Support for overlapping spans in TextView's suggestions."
Gilles Debunne [Wed, 27 Apr 2011 23:01:30 +0000 (16:01 -0700)]
Merge "Support for overlapping spans in TextView's suggestions."

13 years agoMerge "Typo in TextAppearanceSpan documentation"
Gilles Debunne [Wed, 27 Apr 2011 23:00:57 +0000 (16:00 -0700)]
Merge "Typo in TextAppearanceSpan documentation"

13 years agoam a4e7353d: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 22:30:36 +0000 (15:30 -0700)]
am a4e7353d: Import revised translations.  DO NOT MERGE

* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Fix omx_tests to no longer refer to test files that are no longer available."
Andreas Huber [Wed, 27 Apr 2011 22:13:42 +0000 (15:13 -0700)]
Merge "Fix omx_tests to no longer refer to test files that are no longer available."

13 years agoam a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 21:53:26 +0000 (14:53 -0700)]
am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"

* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
  Auto hide virtual keyboard

13 years agoam cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWi...
Conley Owens [Wed, 27 Apr 2011 21:53:15 +0000 (14:53 -0700)]
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"

* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
  onDetachedFromWindow is called before onAttachedToWindow

13 years agoam 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 21:53:10 +0000 (14:53 -0700)]
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoMerge "Fix various hw-accelerated line/point bugs"
Chet Haase [Wed, 27 Apr 2011 21:26:40 +0000 (14:26 -0700)]
Merge "Fix various hw-accelerated line/point bugs"

13 years agoMerge "Correctly compute tex coords for rect layers. Bug #4192695"
Romain Guy [Wed, 27 Apr 2011 21:23:36 +0000 (14:23 -0700)]
Merge "Correctly compute tex coords for rect layers. Bug #4192695"

13 years agoam ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling...
Conley Owens [Wed, 27 Apr 2011 20:54:08 +0000 (13:54 -0700)]
am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
  Add lock before calling initEglImage

13 years agoam 13b21e60: Merge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 20:53:46 +0000 (13:53 -0700)]
am 13b21e60: Merge "Auto hide virtual keyboard"

* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
  Auto hide virtual keyboard

13 years agoam a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
Conley Owens [Wed, 27 Apr 2011 20:53:37 +0000 (13:53 -0700)]
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"

* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
  onDetachedFromWindow is called before onAttachedToWindow

13 years agoam 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 20:48:45 +0000 (13:48 -0700)]
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoam ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 20:41:12 +0000 (13:41 -0700)]
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage

13 years agoMerge "Cleanup rs.spec file and code generator."
Jason Sams [Wed, 27 Apr 2011 20:20:39 +0000 (13:20 -0700)]
Merge "Cleanup rs.spec file and code generator."

13 years agoMerge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 20:20:16 +0000 (13:20 -0700)]
Merge "Auto hide virtual keyboard"

13 years agoMerge "onDetachedFromWindow is called before onAttachedToWindow"
Conley Owens [Wed, 27 Apr 2011 20:14:57 +0000 (13:14 -0700)]
Merge "onDetachedFromWindow is called before onAttachedToWindow"

13 years agoMerge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 20:06:46 +0000 (13:06 -0700)]
Merge changes I0ab47e2f,Ib8016996

* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoam f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:46:09 +0000 (12:46 -0700)]
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
  Add lock before calling initEglImage

13 years agoam 86d1d747: Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:43:19 +0000 (12:43 -0700)]
am 86d1d747: Merge "Add lock before calling initEglImage"

* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
  Add lock before calling initEglImage

13 years agoMerge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:28:05 +0000 (12:28 -0700)]
Merge "Add lock before calling initEglImage"

13 years agoam d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
Gloria Wang [Wed, 27 Apr 2011 19:27:05 +0000 (12:27 -0700)]
am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
  Add heartbeat error codes into MediaErrors.h

13 years agoam b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:24:58 +0000 (12:24 -0700)]
am b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit 'b54bebf47fcd1cfbfdccd67e062d856ec06ce825':
  Fix for startup NPE.

13 years agoam 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
Gloria Wang [Wed, 27 Apr 2011 19:24:42 +0000 (12:24 -0700)]
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit '969749319ca17f6e0c6836303a78cc484df2539b':
  Add heartbeat error codes into MediaErrors.h

13 years agoam 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:21:50 +0000 (12:21 -0700)]
am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
  Fix for startup NPE.

13 years agoam 30d59fa9: Ignore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:18:03 +0000 (12:18 -0700)]
am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
  Fix for startup NPE.

13 years agoam 83ddcdf7: Add heartbeat error codes into MediaErrors.h
Gloria Wang [Wed, 27 Apr 2011 19:11:49 +0000 (12:11 -0700)]
am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
  Add heartbeat error codes into MediaErrors.h

13 years agoMerge "The accessibility input filter state was not unregistered when no spoken feedb...
Svetoslav Ganov [Wed, 27 Apr 2011 19:11:01 +0000 (12:11 -0700)]
Merge "The accessibility input filter state was not unregistered when no spoken feedback accessibility services are regitstered."

13 years agoIgnore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:09:31 +0000 (12:09 -0700)]
Ignore fix for startup NPE as file is deleted.

Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20

13 years agoMerge "Better workaround for the bitmap invalidation problem."
Alex Sakhartchouk [Wed, 27 Apr 2011 19:08:59 +0000 (12:08 -0700)]
Merge "Better workaround for the bitmap invalidation problem."

13 years agoMerge "Fix for startup NPE."
Conley Owens [Wed, 27 Apr 2011 18:40:46 +0000 (11:40 -0700)]
Merge "Fix for startup NPE."

13 years agoMerge "Make DRT pull data over network"
Guang Zhu [Wed, 27 Apr 2011 18:05:28 +0000 (11:05 -0700)]
Merge "Make DRT pull data over network"

13 years agoMerge "Add support for force-enabling zoom"
John Reck [Wed, 27 Apr 2011 17:46:39 +0000 (10:46 -0700)]
Merge "Add support for force-enabling zoom"

13 years agoMerge "Expose TTS engine API"
Bjorn Bringert [Wed, 27 Apr 2011 08:16:21 +0000 (01:16 -0700)]
Merge "Expose TTS engine API"

13 years agoMerge "Fix overlay action bar decor layout for lower context mode area."
Adam Powell [Wed, 27 Apr 2011 01:38:23 +0000 (18:38 -0700)]
Merge "Fix overlay action bar decor layout for lower context mode area."

13 years agoam 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras...
Nick Pelly [Wed, 27 Apr 2011 01:11:02 +0000 (18:11 -0700)]
am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9':
  Implement dead service recovery in NFC extras library.

13 years agoam 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
Nick Pelly [Wed, 27 Apr 2011 01:09:02 +0000 (18:09 -0700)]
am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
  Implement dead service recovery in NFC extras library.

13 years agoMerge "Report errors when eglCreateImageKHR fails"
Mathias Agopian [Wed, 27 Apr 2011 01:05:23 +0000 (18:05 -0700)]
Merge "Report errors when eglCreateImageKHR fails"

13 years agoam cc9ee72b: Implement dead service recovery in NFC extras library.
Nick Pelly [Wed, 27 Apr 2011 01:04:02 +0000 (18:04 -0700)]
am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
  Implement dead service recovery in NFC extras library.

13 years agolibgui: enable tests in the 'tests' build.
Jamie Gennis [Wed, 27 Apr 2011 00:26:37 +0000 (17:26 -0700)]
libgui: enable tests in the 'tests' build.

This change makes the libgui makefile recurse into the tests directory
so that the tests get built by a top-level make when
TARGET_BUILD_VARIANT=tests.

Change-Id: I6f623cc4b86dfeb00b9d21823316dbd9def23110

13 years agoMerge "- Add instrumentation utility to automate rs performance tests: The RsBench...
Xia Wang [Wed, 27 Apr 2011 00:03:05 +0000 (17:03 -0700)]
Merge "- Add instrumentation utility to automate rs performance tests:   The RsBench test activity can be launched within instrumentation"

13 years agoMerge "Import revised translations."
Eric Fischer [Tue, 26 Apr 2011 23:19:04 +0000 (16:19 -0700)]
Merge "Import revised translations."