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
Amith Yamasani
d16a91ab95 Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 2010-07-01 13:51:27 -07:00
Jean-Baptiste Queru
dc932feef0 Merge "Fix missing NL" 2010-07-01 13:46:03 -07:00
Adam Powell
7d95278f16 Merge "Add AbsListView#smoothScrollToPositionFromTop" 2010-07-01 13:45:58 -07:00
Jason Parks
dad67f2df1 Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." 2010-07-01 13:37:13 -07:00
satok
349a24f4c0 Merge "Remove EditStyledText from the framekwork" 2010-07-01 13:24:26 -07:00
Eric Laurent
9c904a1f39 am eba857d1: am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 
Merge commit 'eba857d126e2b76a368f41d3169a56fe28029674'

* commit 'eba857d126e2b76a368f41d3169a56fe28029674':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 11:59:10 -07:00
Andreas Huber
e94811e469 am d51c2cac: am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool. 
Merge commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2'

* commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
 2010-07-01 11:56:16 -07:00
Eric Laurent
88658f5dc0 am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 
Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp

* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 11:56:11 -07:00
Joe Onorato
7e57a61c24 am 393e1459: am a2dd4c17: put the status bar back in the system process 
Merge commit '393e1459340effdb8bdc6531e22c0976d0aea026'

* commit '393e1459340effdb8bdc6531e22c0976d0aea026':
  put the status bar back in the system process
 2010-07-01 11:55:46 -07:00
Joe Onorato
ef5946d5bf am 6fd470fb: am 6be4739e: quiet noisy debug spew 
Merge commit '6fd470fbdc46777d7dc201bd6f475becc7976014'

* commit '6fd470fbdc46777d7dc201bd6f475becc7976014':
  quiet noisy debug spew
 2010-07-01 11:55:42 -07:00
Chih-Chung Chang
06a5bf2930 am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles. 
Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'

* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
  Add multiple camera support for in MediaProfiles.
 2010-07-01 11:55:27 -07:00
Eric Laurent
5517656148 Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 2010-07-01 11:54:00 -07:00
Christopher Tate
6764eff2f7 resolved conflicts for merge of d3233ae9 to master 
Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6
 2010-07-01 11:49:41 -07:00
Andreas Huber
bea516166c am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool. 
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
 2010-07-01 10:07:17 -07:00
Mike Lockwood
002a6aeb73 Merge "MTP: Remove an unnecessary thread from the MtpClient class." 2010-07-01 08:40:24 -07:00
Joe Malin
e6b2b23ecc Merge "Javadoc for test case classes" 2010-07-01 08:31:12 -07:00
Jeff Hamilton
bb56c13edd Merge "More cleanup after removing the Cursor update logic." 2010-07-01 08:29:52 -07:00
Steve Block
ece68141e4 Merge "Add a class to represent the set of sensitive features of a web application" 2010-07-01 08:08:11 -07:00
Joe Onorato
692919be30 am a2dd4c17: put the status bar back in the system process 
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp

* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
  put the status bar back in the system process
 2010-07-01 05:01:52 -07:00
Joe Onorato
530de461e1 am 6be4739e: quiet noisy debug spew 
Merge commit '6be4739e1b302eb447dee195eaecbfcf82317310' into gingerbread-plus-aosp

* commit '6be4739e1b302eb447dee195eaecbfcf82317310':
  quiet noisy debug spew
 2010-07-01 05:01:48 -07:00
Steve Block
185497c059 Merge "Pass the WebView context to the GeolocationService from WebKit" 2010-07-01 02:18:24 -07:00
Chih-Chung Chang
48cf5b1954 am 09b90057: Add multiple camera support for in MediaProfiles. 
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
  Add multiple camera support for in MediaProfiles.
 2010-06-30 20:22:40 -07:00
Mike Lockwood
63103848cd Merge "Try to fix the simulator build." 2010-06-30 19:23:42 -07:00
Romain Guy
fb338da840 Merge "Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)" 2010-06-30 19:23:08 -07:00
Christopher Tate
c6466bfb57 am 160edb36: Add ability to guard a thread against setting its own prio to bg 
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
  Add ability to guard a thread against setting its own prio to bg
 2010-06-30 18:28:08 -07:00
Shimeng (Simon) Wang
0979fa2ef2 Merge "Fix the initial reflow width when switch between basic pages." 2010-06-30 18:03:53 -07:00
Romain Guy
3d23c4e988 Merge "Add implementation for drawBitmap()." 2010-06-30 17:58:12 -07:00
Adam Powell
dc8e84d972 Merge "Define measuring behavior for action bar/context mode custom views" 2010-06-30 17:16:29 -07:00
Alex Sakhartchouk
c852735c95 Merge "Fixing freetype init/uninit code. Removing debug output from stream." 2010-06-30 16:56:10 -07:00
Dianne Hackborn
ed2b843c91 am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread 
Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8'

* commit '177c405a242e811b1010bd8382b5807ab8df31a8':
  Introduce official public NativeWindow type.
 2010-06-30 16:11:21 -07:00
Dianne Hackborn
d729836ff8 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread 
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
 2010-06-30 16:08:24 -07:00
Romain Guy
cf2b4e79ff Merge "Remove unnecessary return and add bitmap generation ID tracking." 2010-06-30 16:07:09 -07:00
Mathias Agopian
41360867a3 am e341a0b5: am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread 
Merge commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f'

* commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f':
  fix live wallpapers on Droid
 2010-06-30 16:05:37 -07:00
Dianne Hackborn
e12e3d7692 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
The Android Open Source Project
b6a7df812c am c511d4f8: merge from open-source master 
Merge commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353'

* commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353':
 2010-06-30 16:02:45 -07:00
Mathias Agopian
aca61c7eb2 am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread 
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp

* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
  fix live wallpapers on Droid
 2010-06-30 16:01:33 -07:00
The Android Open Source Project
743aa84b28 merge from open-source master 
Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be
 2010-06-30 15:59:42 -07:00
Mathias Agopian
05dedd17ec Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Romain Guy
cee2e682cd Merge "Add hooks for drawBitmap()." 2010-06-30 15:50:05 -07:00
Jeff Brown
ac18906a2e am 0c2df984: am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread 
Merge commit '0c2df98425c8fa4ce092eebea80ae197547f6a86'

* commit '0c2df98425c8fa4ce092eebea80ae197547f6a86':
  Fix injection of specially intercepted keys like HOME.
 2010-06-30 15:48:50 -07:00
Christopher Tate
b07600128e am 705a2df9: am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread 
Merge commit '705a2df97c51c3e31ed36831a4302d705e0532b2'

* commit '705a2df97c51c3e31ed36831a4302d705e0532b2':
  Remove memory monitoring from the system watchdog
 2010-06-30 15:48:46 -07:00
Daniel Sandler
2abb80ca63 am 9b4b74be: am 294c9fb8: Improved graphics for the intruder alert. 
Merge commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1'

* commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1':
  Improved graphics for the intruder alert.
 2010-06-30 15:48:41 -07:00
Andreas Huber
e8a6b1586d am 86405cbd: am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread 
Merge commit '86405cbd53f43529898000112bc9346c21569d26'

* commit '86405cbd53f43529898000112bc9346c21569d26':
  Support for vanilla YUV420sp => RGB565 color conversion.
 2010-06-30 15:48:37 -07:00
Doug Zongker
b59dfc3c5e am 6db0ef09: am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo 
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb'

* commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb':
  Verify hostname where possible, and clarify where not.
 2010-06-30 15:48:33 -07:00
Dianne Hackborn
cbef8b45c8 Merge "resolved conflicts for merge of 7f6c6e8f to master" 2010-06-30 15:46:29 -07:00
Dianne Hackborn
b2007c4b89 resolved conflicts for merge of 7f6c6e8f to master 
Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2
 2010-06-30 15:44:58 -07:00
Mathias Agopian
a8f3e4e53c fix live wallpapers on Droid 
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.

Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
 2010-06-30 15:43:47 -07:00
Michael Kolb
b67720a88e Merge "user agent string change: remove "Mobile" for large screen configuration" 2010-06-30 15:40:33 -07:00
Scott Main
02d9133447 am b2d1a71b: am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style. 
Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'

* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
  docs: revise menu guide to focus more on using menu resources
 2010-06-30 15:36:02 -07:00
Jeff Brown
2427ff8529 am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread 
Merge commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712' into gingerbread-plus-aosp

* commit 'd8ae28854e1ed9bd90d7407f94c2e5ed9028b712':
  Fix injection of specially intercepted keys like HOME.
 2010-06-30 15:33:41 -07:00