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

17993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
1a63098226 am 0d929d7f: am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast. 
Merge commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757'

* commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757':
  Make android.hardware.action.USB_STATE a protected broadcast.
 2010-06-29 11:10:33 -07:00
Joe Onorato
247fb4563f resolved conflicts for merge of 32b739b6 to master 
Change-Id: I5a1791d12ca57ee682e46ade7d24b21e9f59aff2
 2010-06-29 13:57:19 -04:00
Dianne Hackborn
9c7f8186ae Update native activity & event APIs to follow correct conventions. 
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
 2010-06-29 10:43:54 -07:00
Joe Onorato
52c230dd56 resolved conflicts for merge of 7f9ede96 to master 
Change-Id: Iaa688e5f7adaa363c88e0824b44233c8906e9e26
 2010-06-29 12:58:39 -04:00
Mike Lockwood
84a5de824f am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast. 
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp

* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
  Make android.hardware.action.USB_STATE a protected broadcast.
 2010-06-29 09:17:36 -07:00
Joe Onorato
e802bddfa1 am 1c95ecb4: recombine StatusBarService and PhoneStatusBarService 
Merge commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9' into gingerbread-plus-aosp

* commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9':
  recombine StatusBarService and PhoneStatusBarService
 2010-06-29 08:04:13 -07:00
Joe Onorato
3ad5690c3f am b54ef614: Separate the status bar height from the icon size. 
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp

* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
  Separate the status bar height from the icon size.
 2010-06-29 08:02:10 -07:00
Mike Lockwood
7ceaa63a65 am f045ddba: am de6bd120: Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 
Merge commit 'f045ddbad94028399ef1caee08347a264cb3729a'

* commit 'f045ddbad94028399ef1caee08347a264cb3729a':
  Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
 2010-06-29 05:32:44 -07:00
Mike Lockwood
e151e27be1 am 9be487ce: am 606d591a: Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread 
Merge commit '9be487ce6be705d210d42f8cbe6468226eeb544e'

* commit '9be487ce6be705d210d42f8cbe6468226eeb544e':
  Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
 2010-06-29 05:32:37 -07:00
Mike Lockwood
8cc3228f37 am de6bd120: Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 
Merge commit 'de6bd120c97bb7986a6bac3889288f77bca63288' into gingerbread-plus-aosp

* commit 'de6bd120c97bb7986a6bac3889288f77bca63288':
  Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
 2010-06-29 05:27:11 -07:00
Mike Lockwood
65a6cf7626 am 606d591a: Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread 
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp

* commit '606d591afee24e31e3885a7330638893db1710f5':
  Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
 2010-06-29 05:27:08 -07:00
Mike Lockwood
0c3af05e12 Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-06-29 05:24:45 -07:00
Mike Lockwood
24c2ff830d Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread 2010-06-29 05:24:22 -07:00
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
Scott Main
fe2871079b 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 froyo-plus-aosp

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
 2010-06-28 15:31:11 -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