ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
17,580 Commits 2 Branches 0 Tags 54 MiB
7be31e16eb
Commit Graph

17580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
7be31e16eb Merge "Fix SDK build." 2010-06-28 21:49:41 -07:00
Mathias Agopian
85af31f368 am 5d31a452: am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread 
Merge commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7'

* commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
 2010-06-28 20:06:21 -07:00
Mathias Agopian
2eb4ed53c1 am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread 
Merge commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407' into gingerbread-plus-aosp

* commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
 2010-06-28 20:04:23 -07:00
Mathias Agopian
f8e79cc372 Merge changes I93dfc4c8,I781953d6 into gingerbread 
* changes:
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
 2010-06-28 20:01:58 -07:00
Mathias Agopian
05650aec9f fix[2798925] Gingerbread TOT not booting 
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.

Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
 2010-06-28 19:54:17 -07:00
Chris Tate
1f0c9ea984 am 96725326: am 31e0ffe8: Merge "Native input event dispatching." into gingerbread 
Merge commit '96725326149687168937cf62f75364cf9cc3e96b'

* commit '96725326149687168937cf62f75364cf9cc3e96b':
  Native input event dispatching.
 2010-06-28 19:16:42 -07:00
Chris Tate
4512638911 am 31e0ffe8: Merge "Native input event dispatching." into gingerbread 
Merge commit '31e0ffe8444b70500cac319da084c4c45e62aca2' into gingerbread-plus-aosp

* commit '31e0ffe8444b70500cac319da084c4c45e62aca2':
  Native input event dispatching.
 2010-06-28 19:14:18 -07:00
Chris Tate
b14c3e7e93 Merge "Native input event dispatching." into gingerbread 2010-06-28 19:12:55 -07:00
Jeff Brown
50de30a523 Native input event dispatching. 
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.

Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
 2010-06-28 19:10:54 -07:00
Romain Guy
26163afa3d Merge "Add support for saveLayer()." 2010-06-28 18:54:09 -07:00
James Dong
6058d36e4c am b1e165eb: am d4760c24: Collect statistical data from authoring engine (second part) 
Merge commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6'

* commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6':
  Collect statistical data from authoring engine (second part)
 2010-06-28 17:30:54 -07:00
James Dong
7da1562254 am d4760c24: Collect statistical data from authoring engine (second part) 
Merge commit 'd4760c243fb129ebda43972c0fadf43a02c9849f' into gingerbread-plus-aosp

* commit 'd4760c243fb129ebda43972c0fadf43a02c9849f':
  Collect statistical data from authoring engine (second part)
 2010-06-28 17:28:07 -07:00
Romain Guy
5439c8d324 Merge "Implement support for PorterDuff's blending modes." 2010-06-28 17:15:24 -07:00
Patrick Dubroy
10ba3aa64a Merge "Add a new attribute to allow widgets to specify a preview image." 2010-06-28 17:00:54 -07:00
James Dong
e3258035b6 am c2c59f69: am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread 
Merge commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b'

* commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b':
  Separate MediaRecorderClient with MediaPlayerClient
 2010-06-28 16:28:11 -07:00
James Dong
4644f0fe94 am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread 
Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp

* commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587':
  Separate MediaRecorderClient with MediaPlayerClient
 2010-06-28 16:25:39 -07:00
James Dong
e1b6c6fe6f Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread 2010-06-28 16:19:40 -07:00
Scott Main
878ba98e8d am 0884cb5e: am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs 
Merge commit '0884cb5ec6dc425bb3848e682000c1c4b70bc4df'

* commit '0884cb5ec6dc425bb3848e682000c1c4b70bc4df':
  docs: update backup guide and bmgr tool
 2010-06-28 15:36:56 -07:00
Scott Main
3fb395dc2e am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs 
Merge commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def' into gingerbread-plus-aosp

* commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def':
  docs: update backup guide and bmgr tool
 2010-06-28 15:34:37 -07:00
Scott Main
a84687252b am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs 
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into gingerbread

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
 2010-06-28 15:31:35 -07:00
Dianne Hackborn
4b6265d905 Merge "Improvements to ListFragment." 2010-06-28 15:26:00 -07:00
Robert Greenwalt
099892bbaf Merge "Reduce Tethering Logging." 2010-06-28 15:19:48 -07:00
Wei Huang
f740855f3c am 5b422186: am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread 
Merge commit '5b422186f3740a228620210db6d0be0a9838be51'

* commit '5b422186f3740a228620210db6d0be0a9838be51':
  new presence icons for video/audio chats.
 2010-06-28 15:11:05 -07:00
Wei Huang
6598367dd3 am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread 
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp

* commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33':
  new presence icons for video/audio chats.
 2010-06-28 15:08:37 -07:00
Wei Huang
d8b9035a1c Merge "new presence icons for video/audio chats." into gingerbread 2010-06-28 15:05:56 -07:00
Daniel Sandler
afe273bdf1 am be5f3121: am 5dbd05ed: Intruder alert! (First try at the immersive-mode alert bar.) 
Merge commit 'be5f31212064b78735cd6f643015f244ad81ce78'

* commit 'be5f31212064b78735cd6f643015f244ad81ce78':
  Intruder alert! (First try at the immersive-mode alert bar.)
 2010-06-28 14:24:33 -07:00
Daniel Sandler
7a3b87e0a6 am 5dbd05ed: Intruder alert! (First try at the immersive-mode alert bar.) 
Merge commit '5dbd05ed18906be3499978303f2fca4f86211567' into gingerbread-plus-aosp

* commit '5dbd05ed18906be3499978303f2fca4f86211567':
  Intruder alert! (First try at the immersive-mode alert bar.)
 2010-06-28 14:22:17 -07:00
Derek Sollenberger
0e774b1142 Merge "Rename a data storage object to better reflect its intended usage." 2010-06-28 10:23:07 -07:00
Gilles Debunne
cb3eeb597a Merge "New XmlAdapters sample code." 2010-06-28 10:21:37 -07:00
Romain Guy
5050934764 Merge "Reduced the complexity of layers composition." 2010-06-27 23:01:58 -07:00
Chih-Chung Chang
fade2bb3dc am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras. 
Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'

* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
  Unhide new API for supporting multiple cameras.
 2010-06-27 20:54:36 -07:00
Chih-Chung Chang
d57b2a6ce9 am de1057c4: Unhide new API for supporting multiple cameras. 
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp

* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
  Unhide new API for supporting multiple cameras.
 2010-06-27 20:49:42 -07:00
Romain Guy
21ec381f6c Merge "Add implementations for saveLayerAlpha() and textured rects." 2010-06-26 00:16:20 -07:00
Irfan Sheriff
6659304cde am 53dca61f: am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread 
Merge commit '53dca61f26f4ff348418add60599213297acc899'

* commit '53dca61f26f4ff348418add60599213297acc899':
  Add setWifiApConfiguration interface
 2010-06-25 19:53:34 -07:00
Irfan Sheriff
547bd14362 am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread 
Merge commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a' into gingerbread-plus-aosp

* commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a':
  Add setWifiApConfiguration interface
 2010-06-25 19:51:50 -07:00
Irfan Sheriff
3b9900423c Merge "Add setWifiApConfiguration interface" into gingerbread 2010-06-25 19:49:58 -07:00
Mathias Agopian
1f7bec634f Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"" 
This reverts commit 330dd304a471d260a73e342a240921c03c825f99.
 2010-06-25 18:02:21 -07:00
James Dong
ed1bc85c2d am fd45c1e6: am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread 
Merge commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798'

* commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798':
  Provide progress status report during authoring
 2010-06-25 16:46:07 -07:00
James Dong
86b9626a44 am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread 
Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp

* commit '41debbc613ec57aa892f604229df376402942687':
  Provide progress status report during authoring
 2010-06-25 16:44:09 -07:00
James Dong
48756cddfa Merge "Provide progress status report during authoring" into gingerbread 2010-06-25 16:40:47 -07:00
David Brown
56509f553e am a0a58235: am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread 
Merge commit 'a0a582355ba10454d2625ce2968015e50a12a3e3'

* commit 'a0a582355ba10454d2625ce2968015e50a12a3e3':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.
 2010-06-25 16:07:05 -07:00
David Brown
896818e384 am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread 
Merge commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b' into gingerbread-plus-aosp

* commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.
 2010-06-25 15:59:33 -07:00
David Brown
c536426ec5 Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread 2010-06-25 15:54:55 -07:00
Jason Sams
a860e34800 Merge "Update fountain to use boolean rather than ints for true/false." 2010-06-25 15:12:29 -07:00
Mathias Agopian
f27f8ed2a3 am 687f8a2e: am 1cb3fdc9: Merge "Fix a bug in sp<> and wp<> which could cause memory corruptions" into gingerbread 
Merge commit '687f8a2eb78c95bb9974951dbe38124f8543bacb'

* commit '687f8a2eb78c95bb9974951dbe38124f8543bacb':
  Fix a bug in sp<> and wp<> which could cause memory corruptions
 2010-06-25 14:22:51 -07:00
Dianne Hackborn
bac7d94703 am 20b8dd3a: am 50dc3bca: Refactor ActivityManagerService activity stack. 
Merge commit '20b8dd3a05ab9f7701631ebc9f81038f31949a9f'

* commit '20b8dd3a05ab9f7701631ebc9f81038f31949a9f':
  Refactor ActivityManagerService activity stack.
 2010-06-25 14:22:47 -07:00
Eric Laurent
d4c8219354 am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread 
Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126'

* commit 'cdf1357b6e0152280dcd611b5f096db4887d8126':
  Various fixes and improvements in audio effects implementation
 2010-06-25 14:22:39 -07:00
Andreas Huber
7016679cc8 am 2f8f81f5: am 330dd304: Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger" 
Merge commit '2f8f81f5c2e42f52b1a7796ef23b83172c6bc4d9'

* commit '2f8f81f5c2e42f52b1a7796ef23b83172c6bc4d9':
  Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
 2010-06-25 14:22:35 -07:00
The Android Open Source Project
606f31da70 am 102d0ab0: merge from froyo-plus-aosp 
Merge commit '102d0ab071af04c81ede8155205a6231b99b140c'

* commit '102d0ab071af04c81ede8155205a6231b99b140c':
 2010-06-25 14:22:31 -07:00
The Android Open Source Project
b4d837432a am 8b0d5bc3: merge from froyo-plus-aosp 
Merge commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631'

* commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631':
  Fixing counting the number of days in call log screen.
 2010-06-25 14:22:25 -07:00