ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,313 Commits 2 Branches 0 Tags 54 MiB
f90b57f612
Commit Graph

33313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Conley Owens
9deec6fe2a Merge "Fix for startup NPE." 2011-04-27 11:40:46 -07:00
Guang Zhu
ccf7f3ee86 Merge "Make DRT pull data over network" 2011-04-27 11:05:28 -07:00
John Reck
f1592e4422 Merge "Add support for force-enabling zoom" 2011-04-27 10:46:39 -07:00
Bjorn Bringert
5b1cdf4716 Merge "Expose TTS engine API" 2011-04-27 01:16:21 -07:00
Adam Powell
2cb34a41f1 Merge "Fix overlay action bar decor layout for lower context mode area." 2011-04-26 18:38:23 -07:00
Nick Pelly
a6bb1444ab am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:11:02 -07:00
Nick Pelly
e8e764a417 am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:09:02 -07:00
Mathias Agopian
0ea7d61fa1 Merge "Report errors when eglCreateImageKHR fails" 2011-04-26 18:05:23 -07:00
Nick Pelly
4dd1b75e82 am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:04:02 -07:00
Xia Wang
a88c78d995 Merge "- Add instrumentation utility to automate rs performance tests: The RsBench test activity can be launched within instrumentation" 2011-04-26 17:03:05 -07:00
Eric Fischer
9ce609a6f1 Merge "Import revised translations." 2011-04-26 16:19:04 -07:00
Conley Owens
5dbfc3b32c am ca15bf7a: am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit 'ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 16:06:19 -07:00
Conley Owens
8365cd27bc am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit '54a952c84317afc64034ded8baad3d788a54026d':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 16:01:13 -07:00
Conley Owens
93d0d8663d am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 15:50:33 -07:00
Conley Owens
7f4b15761b am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit '17ba30b549a847f3aab854173a9484851f694453':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 15:46:32 -07:00
Romain Guy
74d72d46f2 Merge "Apply shaders/filters to text drop shadows. Bug #4318323" 2011-04-26 15:35:27 -07:00
Mathias Agopian
3cd5a11708 Report errors when eglCreateImageKHR fails 
Change-Id: Ica39b72ac2505675e619ef4994bd67b98bf6e7da
 2011-04-26 15:03:27 -07:00
Conley Owens
2d904f106b Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 2011-04-26 14:36:48 -07:00
Romain Guy
40b2edf77f Merge "Update shader text to test with drop shadows." 2011-04-26 14:04:59 -07:00
Stephen Hines
74f80609af Merge "Start ICS header cleanup and finish type matrix." 2011-04-26 13:45:51 -07:00