Eric Fischer
d65eff5087
am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit 'b2149f4a11cddba303674298ef543e76ea11475e':
Import revised translations. DO NOT MERGE
2011-04-28 11:48:43 -07:00
Conley Owens
8c7aa73225
am 4854f70c: Ignore change since file no longer exists
...
* commit '4854f70c0881ff44fabd8c261653bd90210bdc22':
Auto hide virtual keyboard
2011-04-28 11:48:25 -07:00
Stephen Hines
b9ecef2420
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().
2011-04-28 11:48:18 -07:00
John Reck
50bcaa2676
Merge "Use previous version if version is a codename"
2011-04-28 10:38:50 -07:00
Eric Fischer
da4f940876
am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
Import revised translations. DO NOT MERGE
2011-04-28 10:25:52 -07:00
Daniel Sandler
7bb5a49474
Merge "Make InputWindow.h's window types align with WindowManager.java's."
2011-04-28 10:22:49 -07:00
Conley Owens
3c4ebca573
Ignore change since file no longer exists
2011-04-28 10:10:52 -07:00
Jason Sams
aa38f3f6b9
Merge "Add dalvik code for forEach."
2011-04-27 23:00:40 -07:00
Jason Sams
19b43a6486
Merge "Start implementing control side forEach."
2011-04-27 23:00:25 -07:00
Wu-cheng Li
e960d3a874
Merge "Unhide camera focus area and metering area API."
2011-04-27 21:17:52 -07:00
Mathias Agopian
61bac329b8
Merge "Fix uninitialized variable in SurfaceTexture"
2011-04-27 19:01:01 -07:00
Mathias Agopian
cc57d6f883
Fix uninitialized variable in SurfaceTexture
...
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
2011-04-27 18:58:46 -07:00
Stephen Hines
adb031659d
am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '697f8b331bb339e4db716efbb96e2182aac40255':
Check setName() for null string + fix rsRand().
2011-04-27 17:38:53 -07:00
Stephen Hines
c0c4150d2d
am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
Check setName() for null string + fix rsRand().
2011-04-27 17:36:38 -07:00
Stephen Hines
776b2ccd77
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
2011-04-27 17:32:40 -07:00
Dima Zavin
07ae966653
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
2011-04-27 17:13:46 -07:00
Conley Owens
f90b57f612
am c4791bd6: Merge commit \'5e3562a5\' into m
...
* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 17:01:49 -07:00
Conley Owens
691a24f04d
Merge commit '5e3562a5' into m
...
Conflicts:
core/java/android/view/ViewRoot.java
Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
2011-04-27 16:58:24 -07:00
Conley Owens
cc87683217
am eedf20c2: Ignore xml change since file no longer exists
...
* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 16:54:40 -07:00
Conley Owens
2aaa7e9bff
Ignore xml change since file no longer exists
2011-04-27 16:49:07 -07:00
Gilles Debunne
08f212af5e
Merge "Support for overlapping spans in TextView's suggestions."
2011-04-27 16:01:30 -07:00
Gilles Debunne
d889066ccd
Merge "Typo in TextAppearanceSpan documentation"
2011-04-27 16:00:57 -07:00
Eric Fischer
8885bf573b
am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
Import revised translations. DO NOT MERGE
2011-04-27 15:30:36 -07:00
Andreas Huber
bed221752c
Merge "Fix omx_tests to no longer refer to test files that are no longer available."
2011-04-27 15:13:42 -07:00
Conley Owens
e0072d13c0
am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard
2011-04-27 14:53:26 -07:00
Conley Owens
40480f7847
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 14:53:15 -07:00
Conley Owens
81cb77ebcf
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 14:53:10 -07:00
Chet Haase
3136bd34fe
Merge "Fix various hw-accelerated line/point bugs"
2011-04-27 14:26:40 -07:00
Romain Guy
71db327c4b
Merge "Correctly compute tex coords for rect layers. Bug #4192695 "
2011-04-27 14:23:36 -07:00
Conley Owens
345c6114da
am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
Add lock before calling initEglImage
2011-04-27 13:54:08 -07:00
Conley Owens
537ce60c3c
am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
2011-04-27 13:53:46 -07:00
Conley Owens
0581488aa6
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 13:53:37 -07:00
Conley Owens
697922855c
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:48:45 -07:00
Conley Owens
ddc25bb92e
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
Add lock before calling initEglImage
2011-04-27 13:41:12 -07:00
Jason Sams
e940cc1ea0
Merge "Cleanup rs.spec file and code generator."
2011-04-27 13:20:39 -07:00
Conley Owens
aff77c78f7
Merge "Auto hide virtual keyboard"
2011-04-27 13:20:16 -07:00
Conley Owens
1a43e04fd7
Merge "onDetachedFromWindow is called before onAttachedToWindow"
2011-04-27 13:14:57 -07:00
Conley Owens
61b1dd24a9
Merge changes I0ab47e2f,Ib8016996
...
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
f0015cab94
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
2011-04-27 12:46:09 -07:00
Conley Owens
a97b487178
am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
2011-04-27 12:43:19 -07:00
Conley Owens
4dc780e366
Merge "Add lock before calling initEglImage"
2011-04-27 12:28:05 -07:00
Gloria Wang
6a0b883359
am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:27:05 -07:00
Conley Owens
12d06f72eb
am b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit 'b54bebf47fcd1cfbfdccd67e062d856ec06ce825':
Fix for startup NPE.
2011-04-27 12:24:58 -07:00
Gloria Wang
27030e51a0
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:24:42 -07:00
Conley Owens
3cf9899bfa
am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
Fix for startup NPE.
2011-04-27 12:21:50 -07:00
Conley Owens
100a051134
am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
2011-04-27 12:18:03 -07:00
Gloria Wang
6f9bbdf31a
am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:11:49 -07:00
Svetoslav Ganov
ae2359da06
Merge "The accessibility input filter state was not unregistered when no spoken feedback accessibility services are regitstered."
2011-04-27 12:11:01 -07:00
Conley Owens
ff13c6559c
Ignore fix for startup NPE as file is deleted.
...
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00
Alex Sakhartchouk
708f726ca0
Merge "Better workaround for the bitmap invalidation problem."
2011-04-27 12:08:59 -07:00