ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
18,435 Commits 2 Branches 0 Tags 54 MiB
25cdf44878
Commit Graph

18435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
25cdf44878 Merge "Fix pressed states on system bar buttons." 2010-07-22 06:19:21 -07:00
Ben Murdoch
715f0a6be3 Merge "Make sure to set a Resource Response on the native side in all cases." 2010-07-22 02:25:28 -07:00
Romain Guy
94989aed75 Merge "Add text rendering." 2010-07-21 21:34:47 -07:00
Steve Howard
e70e61f324 am 5e43c5a6: am b8e07a51: DL manager support for broadcasts + connectivity control 
Merge commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746'

* commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746':
  DL manager support for broadcasts + connectivity control
 2010-07-21 21:27:02 -07:00
Steve Howard
148fbb344b am b8e07a51: DL manager support for broadcasts + connectivity control 
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp

* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
  DL manager support for broadcasts + connectivity control
 2010-07-21 21:22:58 -07:00
Mathias Agopian
267e73c675 am 1f2ec407: am 23e8de26: propagate sensor event rate properly 
Merge commit '1f2ec4070aa9c999d41dc50a892a896e894c5710'

* commit '1f2ec4070aa9c999d41dc50a892a896e894c5710':
  propagate sensor event rate properly
 2010-07-21 18:13:39 -07:00
Mathias Agopian
7137392f2c am 994fff70: am 5df13ef3: SensorService doesn\'t crash if correct HAL is not present 
Merge commit '994fff705ee8a7a8e9826ade53a5220949a28192'

* commit '994fff705ee8a7a8e9826ade53a5220949a28192':
  SensorService doesn't crash if correct HAL is not present
 2010-07-21 18:13:35 -07:00
Mathias Agopian
4c1fd8bfd9 am 042efd6c: am b9cdead4: Merge "Better dumpsys logs" into gingerbread 
Merge commit '042efd6c9251064f09705882180d9ab18ce4e914'

* commit '042efd6c9251064f09705882180d9ab18ce4e914':
  Better dumpsys logs
 2010-07-21 18:13:32 -07:00
Mathias Agopian
8cdc770d3a am 808fd2ff: am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 
Merge commit '808fd2ff89fa2feee568bb64017eece73d6b24cb'

* commit '808fd2ff89fa2feee568bb64017eece73d6b24cb':
  Added partial support for repporting sensor activity to IBatteryStats
 2010-07-21 18:13:27 -07:00
Mathias Agopian
c8d6daf88a Merge "resolved conflicts for merge of bc54e63c to master" 2010-07-21 18:11:33 -07:00
Mathias Agopian
a7a3160daa resolved conflicts for merge of bc54e63c to master 
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
 2010-07-21 18:10:22 -07:00
Mathias Agopian
7e2ac50874 am 23e8de26: propagate sensor event rate properly 
Merge commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65' into gingerbread-plus-aosp

* commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65':
  propagate sensor event rate properly
 2010-07-21 16:12:28 -07:00
Mathias Agopian
96244f7e2c am 5df13ef3: SensorService doesn\'t crash if correct HAL is not present 
Merge commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0' into gingerbread-plus-aosp

* commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0':
  SensorService doesn't crash if correct HAL is not present
 2010-07-21 16:12:25 -07:00
Mathias Agopian
8df98c0ff3 am b9cdead4: Merge "Better dumpsys logs" into gingerbread 
Merge commit 'b9cdead457fb86efc125db8c1c6954c4af1d7388' into gingerbread-plus-aosp

* commit 'b9cdead457fb86efc125db8c1c6954c4af1d7388':
  Better dumpsys logs
 2010-07-21 16:10:04 -07:00
Mathias Agopian
78c5611eed am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 
Merge commit '865991b075de1df8144426b5c2b2f341e4e33d33' into gingerbread-plus-aosp

* commit '865991b075de1df8144426b5c2b2f341e4e33d33':
  Added partial support for repporting sensor activity to IBatteryStats
 2010-07-21 16:10:00 -07:00
Mathias Agopian
65b04b8740 am e4764521: Merge "new SensorService" into gingerbread 
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp

* commit 'e4764521353e898554931a557460fc49209fb0a9':
  new SensorService
 2010-07-21 16:09:55 -07:00
Mathias Agopian
e3c8234765 propagate sensor event rate properly 
Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
 2010-07-21 16:09:39 -07:00
Mathias Agopian
49f2aee90c Merge "Better dumpsys logs" into gingerbread 2010-07-21 16:07:32 -07:00
Mathias Agopian
883b3e9206 Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 2010-07-21 16:07:15 -07:00
Mathias Agopian
39e1a83cad Merge "new SensorService" into gingerbread 2010-07-21 16:06:46 -07:00
Vasu Nori
521e48c2f3 Merge "don't store mDatabase in SQLiteCursor as it is already in SQLiteQuery" 2010-07-21 16:05:14 -07:00
Dan Egnor
4d5e5cc69f am 7da38863: am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit '7da38863d4382746090bf50413b1774ab04f6bc1'

* commit '7da38863d4382746090bf50413b1774ab04f6bc1':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 15:00:27 -07:00
Adam Powell
510acafc39 Merge "Fix bug 2859423 - action bar: need a way to choose item in spinner" 2010-07-21 14:35:41 -07:00
Dan Egnor
633bc6b86e am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit '3685db7f5dd8a830a4e096404d4924e12697fb78' into gingerbread-plus-aosp

* commit '3685db7f5dd8a830a4e096404d4924e12697fb78':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 13:58:08 -07:00
Dan Egnor
2307948dde am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit 'e8605af513e846f6cd223c9e92461189727d8c9b' into gingerbread

* commit 'e8605af513e846f6cd223c9e92461189727d8c9b':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 13:55:13 -07:00
Dan Egnor
e39c274841 Merge "Avoid leaking file descriptors when returning drop box events." into froyo 2010-07-21 13:53:23 -07:00
Chet Haase
f90b734c29 Merge "Fix issue with touch MOVE events on transformed containers" 2010-07-21 13:34:23 -07:00
Ben Komalo
5292ae4ee7 Merge "Relay stopLoading() on the loader from LoaderInfo.stop()" 2010-07-21 13:28:45 -07:00
Andreas Huber
152c520878 am f0d87989: am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread 
Merge commit 'f0d87989931757cdc50524d282fc151ef88eeafe'

* commit 'f0d87989931757cdc50524d282fc151ef88eeafe':
  Add a seek test to the stagefright commandline tool.
 2010-07-21 13:07:41 -07:00
Andreas Huber
e93e62659a am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread 
Merge commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e' into gingerbread-plus-aosp

* commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e':
  Add a seek test to the stagefright commandline tool.
 2010-07-21 13:04:33 -07:00
Shih-wei Liao
9aa76b5760 Merge "rs_types.rsh and rs_math.rsh are default include files. Remove their #include." 2010-07-21 12:46:01 -07:00
Andreas Huber
4745f5aea6 Merge "Add a seek test to the stagefright commandline tool." into gingerbread 2010-07-21 12:31:14 -07:00
Jaikumar Ganesh
e898dce6a4 Merge "Allow multiple HID devices to be connected." 2010-07-21 12:10:35 -07:00
Tom Taylor
a0f4d0496c Merge "Fix a merge problem with html mms" 2010-07-21 11:51:56 -07:00
Daniel Sandler
bd81784d74 Merge "Disable hiding of the system bar on xlarge devices." 2010-07-21 11:45:48 -07:00
Jaikumar Ganesh
7163e16b39 Merge "Add HID to the state machine and add native call backs." 2010-07-21 11:42:21 -07:00
Tom Taylor
25aaba99ef am aa0f5550: am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127'

* commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127':
  Fix a merge problem with html mms
 2010-07-21 11:29:39 -07:00
Tom Taylor
366cd9b7e9 am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp

* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
  Fix a merge problem with html mms
 2010-07-21 11:26:17 -07:00
Tom Taylor
36cdee48ec am dbac180d: Fix a merge problem with html mms 
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread

* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
  Fix a merge problem with html mms
 2010-07-21 11:22:22 -07:00
Chet Haase
0e3367ccc0 Merge "Add keyframes to animation framework." 2010-07-21 11:08:29 -07:00
Andreas Huber
f8978f0c77 am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread 
Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'

* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
  Support finer seek control on MediaSources.
 2010-07-21 10:41:45 -07:00
Andreas Huber
eb32ea5cc8 am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread 
Merge commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce' into gingerbread-plus-aosp

* commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce':
  Support finer seek control on MediaSources.
 2010-07-21 10:39:00 -07:00
Andreas Huber
976f08643c Merge "Support finer seek control on MediaSources." into gingerbread 2010-07-21 10:36:08 -07:00
Eric Laurent
779396a12b am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:52:17 -07:00
Eric Laurent
368d342e18 am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:49:27 -07:00
jsh
947265f8d4 Merge "Add support for PSC of serving cell." 2010-07-21 09:27:04 -07:00
The Android Open Source Project
22e341613f am 42ef77f3: merge from open-source master 
Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method
 2010-07-21 08:15:45 -07:00
The Android Open Source Project
185dd8939f am e9e04673: merge from open-source master 
Merge commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530'

* commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530':
  replaced deprecated setButton Methods
 2010-07-21 08:13:02 -07:00
The Android Open Source Project
154ad59ade merge from open-source master 
Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
 2010-07-21 08:07:26 -07:00
The Android Open Source Project
e090c99860 merge from open-source master 
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
 2010-07-21 08:05:45 -07:00