LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,461 Commits 2 Branches 0 Tags
df92d5c5f66fe488bd7f95071e787d16bd3ecf52
Commit Graph

6461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David 'Digit' Turner
8fc94823cf am 42a6c754: am 3a38c110: Merge "Fix mac build" 
* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
  Fix mac build
 2011-05-17 12:21:29 -07:00
David 'Digit' Turner
42a6c75463 am 3a38c110: Merge "Fix mac build" 
* commit '3a38c110a970c443c09df6a529a78f5b02a870dc':
  Fix mac build
 2011-05-17 12:18:07 -07:00
Raphael Moll
7d747db6b1 am 08382e1e: am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs"" 
* commit '08382e1e2cae7d0bdf94c493edd24a2644de9b5d':
  Revert "this checkin supports windows OS in all Translator libs"
 2011-05-17 12:14:34 -07:00
Raphael Moll
08382e1e2c am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs"" 
* commit 'ed78d63de23730be2a85b7a55b5646b7dc4b7057':
  Revert "this checkin supports windows OS in all Translator libs"
 2011-05-17 12:11:42 -07:00
Raphael Moll
ed78d63de2 am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs"" 
* commit '3fe7791ca18012b69f4663bf69901dd302f2d87f':
  Revert "this checkin supports windows OS in all Translator libs"
 2011-05-17 12:09:24 -07:00
David 'Digit' Turner
3a38c110a9 Merge "Fix mac build" 2011-05-17 12:01:39 -07:00
David 'Digit' Turner
2840185690 Fix mac build 
Change-Id: I1fc8c5043160dbe2508324655fb506bc31cc50ac
 2011-05-17 21:00:52 +02:00
Raphael Moll
3fe7791ca1 Merge "Revert "this checkin supports windows OS in all Translator libs"" 2011-05-17 11:54:40 -07:00
Raphael Moll
603b37abac Revert "this checkin supports windows OS in all Translator libs" 
This reverts commit 0bf6848571.

This commit breaks Mca builds:
  development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp: In function 'EGLBoolean eglChooseConfig(void*, const EGLint*, void**, EGLint, EGLint*)':
  development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp:412: error: 'PIXEL_FORMAT_INITIALIZER' was not declared in this scope
  make: *** [out/host/darwin-x86/obj/SHARED_LIBRARIES/libEGL_translator_intermediates/EglImp.o] Error 1
 2011-05-17 11:41:30 -07:00
David Turner
e6ac336c1c am c8e4598a: am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"" 
* commit 'c8e4598a5e29aae5e973ea033b81dd2b64e19492':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
 2011-05-17 06:21:54 -07:00
David Turner
c8e4598a5e am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"" 
* commit '97d1ddc632df673693b570bcb8f8fa99b5b9b6da':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
 2011-05-17 06:19:57 -07:00
David Turner
97d1ddc632 am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"" 
* commit '4e79d11a66e73052c6d06de5a99da022b0eb7335':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
 2011-05-17 06:17:24 -07:00
Amit Feller
1f4c692222 adding functionality to get the local name of an object from it's local name 
Change-Id: I8c9ccc36a5fb70a38a77fa0f0e7826a6fe886db1
 2011-05-17 16:10:27 +03:00
David Turner
4e79d11a66 Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"" 2011-05-17 06:03:36 -07:00
Amit Feller
02c3e538e8 fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth" 
Change-Id: I9700bdb973d2dc01400078c349010a271004dbd9
 2011-05-17 15:33:43 +03:00
David Turner
8748cfe6e9 am df0c8dbf: am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs" 
* commit 'df0c8dbf3d1385205da839011d4645bf1c57f430':
  this checkin supports windows OS in all Translator libs
 2011-05-17 04:49:52 -07:00
David Turner
df0c8dbf3d am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs" 
* commit 'ce5934c3a025d656a7c268e15b766b0b8f20af53':
  this checkin supports windows OS in all Translator libs
 2011-05-17 04:45:07 -07:00
David Turner
ce5934c3a0 am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs" 
* commit '89bccc8bd926a4f66b059e292aadb1281b119db3':
  this checkin supports windows OS in all Translator libs
 2011-05-17 04:23:22 -07:00
David Turner
89bccc8bd9 Merge "this checkin supports windows OS in all Translator libs" 2011-05-17 03:45:09 -07:00
Amit Feller
0bf6848571 this checkin supports windows OS in all Translator libs 
Change-Id: Ie5111d9c435b64d205b140a79863c0273742ee7f
 2011-05-17 11:20:25 +03:00
Robert Greenwalt
b925721fdf Fix Development app to use netd for routes 
Change-Id: I668d7165821071850a9b6011bc32eba1682e59ac
 2011-05-16 10:26:16 -07:00
Ben Murdoch
ad41ab204d Merge "Merge WebKit at r75993: Update Makefiles" 2011-05-16 08:04:43 -07:00
David Turner
8e80722a9f am d30ae48e: am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os" 
* commit 'd30ae48ee4156c05eb310bea2fbcd94e14ebba15':
  small changes to the code before the commit for supporting windows os
 2011-05-16 07:41:03 -07:00
David Turner
2d81f95693 am 225830ef: am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static" 
* commit '225830effb32b24aca07dce61b097c0d8deee940':
  changing GLcommon lib to be a sharedlib instead of static
 2011-05-16 07:40:59 -07:00
David Turner
d30ae48ee4 am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os" 
* commit '41709da80e95e94d9f533a18b11c646f56cebfba':
  small changes to the code before the commit for supporting windows os
 2011-05-16 07:34:01 -07:00
David Turner
225830effb am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static" 
* commit '7ff51735737bae34b0fe2b7e326a4843fde3b115':
  changing GLcommon lib to be a sharedlib instead of static
 2011-05-16 07:33:54 -07:00
David Turner
41709da80e am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os" 
* commit 'b5f5dce4c722e797d9acbfaea24123dfbc58a82b':
  small changes to the code before the commit for supporting windows os
 2011-05-16 07:15:39 -07:00
David Turner
7ff5173573 am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static" 
* commit '92c079dfd65b254ffbfa33060297170e6bbcd93a':
  changing GLcommon lib to be a sharedlib instead of static
 2011-05-16 07:15:36 -07:00
David Turner
b5f5dce4c7 Merge " small changes to the code before the commit for supporting windows os" 2011-05-16 06:43:58 -07:00
David Turner
92c079dfd6 Merge "changing GLcommon lib to be a sharedlib instead of static" 2011-05-16 06:40:07 -07:00
Ben Murdoch
5b0331a3ff Merge WebKit at r75993: Update Makefiles 
Update makefile to take into account new WebKit source
location.

Change-Id: I5b3d43c2707ce393ec37bfac61ecc7e507ca8c3e
 2011-05-16 12:29:28 +01:00
Jeff Sharkey
e372698ae0 Merge "Formatting rules specific to Eclipse 3.5." 2011-05-13 16:13:37 -07:00
Dianne Hackborn
73b4fea09c am 8486cba6: (-s ours) am d9012d1b: DO NOT MERGE. Integrate API demo work from master. 
* commit '8486cba691e103ee73ce32861342bc8e0c00f646':
  DO NOT MERGE.  Integrate API demo work from master.
 2011-05-13 15:47:53 -07:00
Dianne Hackborn
8486cba691 am d9012d1b: DO NOT MERGE. Integrate API demo work from master. 
* commit 'd9012d1bfa132969fb8fed737e2f9f19eefbc0b5':
  DO NOT MERGE.  Integrate API demo work from master.
 2011-05-13 15:45:34 -07:00
The Android Automerger
f60f953912 merge in gingerbread-release history after reset to gingerbread 2011-05-13 14:27:33 -07:00
Dianne Hackborn
d9012d1bfa DO NOT MERGE. Integrate API demo work from master. 
New API demo for the support library FragmentPager class.

Add API demo for new -wNNNdp and -hNNNdp configs.

Add new API demo for implementing a custom loader.

Also turn the fragment cursor list demo into a loader cursor demo.
 2011-05-13 13:31:52 -07:00
Jeff Sharkey
8fd5ab0db8 Formatting rules specific to Eclipse 3.5. 
Keep separate formatting rules for old Eclipse versions, since they
incorrectly handle "join_wrapped_lines" option.

Change-Id: I02b877ba8517d09c6f1dfed6b6baea822c06fca9
 2011-05-13 13:17:44 -07:00
Dianne Hackborn
b6054b4888 More improvements to pager. 
Also another size step for the resource screen size sample.

Change-Id: I9e8b63d2fc9a0ceab7b003f7bd75218b78311ed6
 2011-05-13 12:15:54 -07:00
Steve Block
d02fa8b7b9 Merge "Fix WebCore include paths due to merge to WebKit r75315" 2011-05-13 06:45:07 -07:00
Steve Block
6557199f1f Fix WebCore include paths due to merge to WebKit r75315 
The WebCore directory has moved inside a new Source directory.

Change-Id: Idce70451e1526a5c92d4b3abcc5bd2dbf3fca903
 2011-05-13 11:47:39 +01:00
Jean-Baptiste Queru
4a8ac3deda am 39e63e52: Merge 6a79f798 
* commit '39e63e526a196f4d22e37a1ec11079fa4672a071':
  test_defs: new CTS security test.
 2011-05-12 17:31:48 -07:00
Jean-Baptiste Queru
39e63e526a Merge 6a79f798 
Change-Id: I1bb91242b2fb7651ba0505c416d7559d50259472
 2011-05-12 16:28:47 -07:00
Jean-Baptiste Queru
6a79f79832 am 3ef19fa9: Merge "test_defs: new CTS security test." into gingerbread 
* commit '3ef19fa91771be93f398af577a4432bb0fd571aa':
  test_defs: new CTS security test.
 2011-05-12 16:20:21 -07:00
Jean-Baptiste Queru
3ef19fa917 Merge "test_defs: new CTS security test." into gingerbread 2011-05-12 15:56:22 -07:00
David 'Digit' Turner
f3d15e4ff7 am 265327f0: am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements" 
* commit '265327f06c60aeed17e600db12ad40367c50ae72':
  emulator: opengl: ut_renderer usability improvements
 2011-05-11 13:11:51 -07:00
Amit Feller
6203540306 small changes to the code before the commit for supporting windows os 
Change-Id: I062add6d6340677a9e2e98ac47d53c87ad2a6535
 2011-05-11 17:48:21 +03:00
Amit Feller
e387c21109 changing GLcommon lib to be a sharedlib instead of static 
Change-Id: Ic1fdcd1fbf3105a6fbd26c77e58acbe9b09dcacb
 2011-05-11 17:31:02 +03:00
David 'Digit' Turner
265327f06c am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements" 
* commit 'd1ac6bdc3b3b4c2fe788d8b8f7886ac625cb1559':
  emulator: opengl: ut_renderer usability improvements
 2011-05-10 17:19:04 -07:00
Alex Sakhartchouk
7efa2db5a1 Merge "Some refactoring of the code." 2011-05-10 10:03:06 -07:00
David 'Digit' Turner
d1ac6bdc3b Merge "emulator: opengl: ut_renderer usability improvements" 2011-05-09 02:45:28 -07:00