ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,830 Commits 2 Branches 0 Tags 54 MiB
d6b746034d
Commit Graph

11830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
57bb82bdc4 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it. 
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
 2010-01-11 14:20:53 -08:00
Tom Taylor
752eae6149 am 1edd8277: Merge "Hide unused fields" into eclair 
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
 2010-01-11 14:15:51 -08:00
Derek Sollenberger
a6bea15589 am 1fed31aa: am fef4874a: fixing build break by removing unused imports. 
Merge commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8'

* commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8':
  fixing build break by removing unused imports.
 2010-01-11 14:14:28 -08:00
Tom Taylor
216cb739d8 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Trevor Johns
247d3a9858 am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'

* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:08:15 -08:00
Trevor Johns
bd74632bcb am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:05:55 -08:00
Trevor Johns
3fb5c80eb0 Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 2010-01-11 14:00:54 -08:00
Dirk Dougherty
ae0c32322e am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9'

* commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 13:50:42 -08:00
Grace Kloba
b4d83d5aea am 6c87c77d: (-s ours) am a2b0d38f: First draft of multitouch in the WebView. 
Merge commit '6c87c77de449f6f85b822022501c2de7ecd24660'

* commit '6c87c77de449f6f85b822022501c2de7ecd24660':
  First draft of multitouch in the WebView.
 2010-01-11 13:49:49 -08:00
Derek Sollenberger
ee153b2305 am fef4874a: fixing build break by removing unused imports. 
Merge commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009' into eclair-mr2-plus-aosp

* commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009':
  fixing build break by removing unused imports.
 2010-01-11 13:31:43 -08:00
Derek Sollenberger
4b21578c52 am d55aa751: am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context. 
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'

* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
  consolidating to only use one surface per plugin. give plugin access to java context.
 2010-01-11 13:23:41 -08:00
Derek Sollenberger
285a13f335 am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context. 
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp

* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
  consolidating to only use one surface per plugin. give plugin access to java context.
 2010-01-11 13:11:13 -08:00
Jack Palevich
fd3f7d68af am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 
Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186'

* commit '90ce68a99f8803643d83be963aa0f28fa952a186':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
 2010-01-11 13:00:36 -08:00
Vasu Nori
a7a02f9ecb am 9c74295f: am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 
Merge commit '9c74295fb16da0469304a7c04c471915e28d09bd'

* commit '9c74295fb16da0469304a7c04c471915e28d09bd':
  add eventlog message whenever sqlite reports db corruption error
 2010-01-11 13:00:28 -08:00
Scott Main
ee76c1cbeb am c9a26f29: am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering) 
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'

* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
  javadoc change: fix the selector sample XML in the class
 2010-01-11 13:00:14 -08:00
Dirk Dougherty
1d4fcc764d am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 11:38:04 -08:00
Dirk Dougherty
8eeeeb1ba4 Merge "SDK doc change: Miscellaneous fixes." into eclair 2010-01-11 11:33:57 -08:00
Mike Lockwood
389e94b37a Merge "Unhide LocationManager APIs needed for unbundled location providers." 2010-01-11 10:48:51 -08:00
Andrei Popescu
c2398cfd06 Merge "Allow a video to be correctly resumed programatically after being paused." 2010-01-11 10:47:23 -08:00
Grace Kloba
e840bede1b am a2b0d38f: First draft of multitouch in the WebView. 
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp

* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
  First draft of multitouch in the WebView.
 2010-01-11 10:47:21 -08:00
San Mehat
e669f3d27f Merge "MountService: Clean up some logspam" 2010-01-11 10:10:10 -08:00
Bjorn Bringert
6f71b35998 Merge "Copy SearchSourceSelector from QuickSearchBox" 2010-01-11 08:39:24 -08:00
Leon Scroggins
fbc76a3f6e am ff7d33b5: am 04e0a101: Bring up IME after receiving a response from webkit. 
Merge commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9'

* commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9':
  Bring up IME after receiving a response from webkit.
 2010-01-11 06:58:51 -08:00
Leon Scroggins
7e0838af61 am 04e0a101: Bring up IME after receiving a response from webkit. 
Merge commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a' into eclair-mr2-plus-aosp

* commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a':
  Bring up IME after receiving a response from webkit.
 2010-01-11 06:42:13 -08:00
Jack Palevich
91ea437c47 am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp

* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
 2010-01-09 21:54:28 -08:00
Jack Palevich
8577a7d452 Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 2010-01-09 21:51:05 -08:00
Vasu Nori
370c36a175 am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 
Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp

* commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
  add eventlog message whenever sqlite reports db corruption error
 2010-01-08 16:33:50 -08:00
Scott Main
86a34cbd6d am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering) 
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp

* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
  javadoc change: fix the selector sample XML in the class
 2010-01-08 16:33:45 -08:00
Daniel Sandler
07239e2c34 am cffea95e: (-s ours) am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair 
Merge commit 'cffea95e1ef203223b87ae8a6bde415b25c5c415'

* commit 'cffea95e1ef203223b87ae8a6bde415b25c5c415':
  Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
 2010-01-08 16:33:00 -08:00
Eric Laurent
7ca087c1dc am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly. 
Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629'

* commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
 2010-01-08 16:28:21 -08:00
Romain Guy
3150097fb0 Merge "Deprecate fill_parent and introduce match_parent. Bug: #2361749." 2010-01-08 15:32:18 -08:00
Charles Chen
83c7cfe2cb Merge "Enabling multiple apps to use different speech synthesis engines and not interfere with one another." 2010-01-08 15:26:57 -08:00
Jean-Michel Trivi
1760b7cad5 Merge "Remove useless start of AudioTrack for TTS and improper volume setting. The AudioTrack that plays the synthesized audio data should only be started when the first synthesis request is sent, not after the initialization of the engine. The track volume should be initialized to it nominal level. Volumes above 1 do not provide amplification, so setting the volume to 2 is not necessary." 2010-01-08 15:21:39 -08:00
Romain Guy
e8b6618c4c Deprecate fill_parent and introduce match_parent. 
Bug: #2361749.
 2010-01-08 15:11:38 -08:00
Vasu Nori
a1322cae44 Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 2010-01-08 15:09:12 -08:00
San Mehat
e965dda18b Merge "MountService: Add new Settings for UMS prompting and notification behavior" 2010-01-08 15:05:57 -08:00
San Mehat
a836f7187f Merge "Settings: Add settings for MountService prefs and bump DB version to 46" 2010-01-08 15:03:43 -08:00
Mike Reed
714fbe5571 Merge "explicitly initialize static final boolean to fix build" 2010-01-08 14:36:52 -08:00
Andreas Huber
1d8778f7aa Merge "Reorganize some of the stagefright implementation related to metadata." 2010-01-08 14:09:01 -08:00
Mike Reed
7f34c55314 Merge "optional flag to enable tracker debugging" 2010-01-08 13:34:54 -08:00
Tom O'Neill
20817a4496 Merge "ContentResolver.query() includes performance considerations" 2010-01-08 13:04:56 -08:00
Joe Onorato
51632e800a less log spew 2010-01-08 15:46:24 -05:00
San Mehat
3e0a34ff32 Merge "MountService: Fix asec list bug" 2010-01-08 12:38:24 -08:00
Daniel Sandler
1eea5185e5 am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair 
Merge commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd' into eclair-plus-aosp

* commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd':
  Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
 2010-01-08 12:33:17 -08:00
Daniel Sandler
8fe921768f Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair 2010-01-08 12:31:03 -08:00
Eric Laurent
ac5002e716 am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly. 
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
 2010-01-08 12:17:08 -08:00
Erik Pasternak
c0ce7a6aad Merge "b/2293263 Finished removing busyBits references." 2010-01-08 10:45:35 -08:00
Eric Fischer
9823a92167 Merge "Update with latest translations." 2010-01-08 10:00:58 -08:00
Andrei Popescu
0e34ec2c58 Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database." 2010-01-08 09:49:31 -08:00
Patrick Scott
98de6c4a91 Merge "Deprecate onTooManyRedirects." 2010-01-08 09:23:44 -08:00