ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,395 Commits 2 Branches 0 Tags 54 MiB
28606319e6
Commit Graph

14395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Quintana
9618159766 am 3667b9b4: am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken

* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
  revert the stripping of System Group:
 2010-04-02 11:00:30 -07:00
Daniel Sandler
ad27615f98 am 25642f0b: Merge "Make desk mode work again." into froyo 
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp

* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
  Make desk mode work again.
 2010-04-02 10:59:41 -07:00
Daniel Sandler
9e2cd9a4c0 Merge "Make desk mode work again." into froyo 2010-04-02 10:54:57 -07:00
Fred Quintana
5f8ce2b7bf am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp

* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
  revert the stripping of System Group:
 2010-04-02 10:53:22 -07:00
Fred Quintana
51eeb54714 Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 10:47:11 -07:00
Brett Chabot
220eec1971 am f5071884: am c1548e38: Merge "Add test annotations to frameworks common tests." into froyo 
Merge commit 'f5071884809219edb420a4f7c4a0eef9523d7bca' into kraken

* commit 'f5071884809219edb420a4f7c4a0eef9523d7bca':
  Add test annotations to frameworks common tests.
 2010-04-02 10:33:51 -07:00
Brett Chabot
4371e8da29 am c1548e38: Merge "Add test annotations to frameworks common tests." into froyo 
Merge commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp

* commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192':
  Add test annotations to frameworks common tests.
 2010-04-02 10:28:36 -07:00
Brett Chabot
c4a82edf66 Merge "Add test annotations to frameworks common tests." into froyo 2010-04-02 10:24:00 -07:00
Grace Kloba
46740ea2fd am f34d9e20: am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken

* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:22:07 -07:00
Grace Kloba
95ec80add2 am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp

* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:19:06 -07:00
Jean-Michel Trivi
34a9636ac0 am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 
Merge commit '28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken

* commit '28525488fb5769fb119b01db17dc0ed305f0e7b0':
  Fix bug 2565463 Ensure an object cannot appear twice in the
 2010-04-02 09:16:05 -07:00
Dave Sparks
9d46928775 am 6c8770df: am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 
Merge commit '6c8770df939782d767fdf2cdb68c4a289015a5e6' into kraken

* commit '6c8770df939782d767fdf2cdb68c4a289015a5e6':
  Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
 2010-04-02 09:16:02 -07:00
Grace Kloba
4443e6ce77 Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo 2010-04-02 09:14:39 -07:00
Jean-Michel Trivi
4beb20feeb am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 
Merge commit '9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp

* commit '9ab05fff41e983c9b3175096c320aefced81276b':
  Fix bug 2565463 Ensure an object cannot appear twice in the
 2010-04-02 09:12:10 -07:00
Dave Sparks
26e4b29206 am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 
Merge commit 'd9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp

* commit 'd9c16c37ea28933973f32cb434f770226266b675':
  Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
 2010-04-02 09:11:56 -07:00
Jean-Michel Trivi
4c9bf79786 Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 08:53:42 -07:00
Brett Chabot
49b35b5f9c Add test annotations to frameworks common tests. 
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
 2010-04-02 08:53:22 -07:00
Dave Sparks
8421672e2e Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 2010-04-02 07:56:44 -07:00
Brett Chabot
68cec9661c am 16d77b8d: am c162668e: Merge "More framework tests cleanup." into froyo 
Merge commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed' into kraken

* commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed':
  More framework tests cleanup.
 2010-04-01 21:53:19 -07:00
Brett Chabot
f1324c71f7 am c162668e: Merge "More framework tests cleanup." into froyo 
Merge commit 'c162668e870cda9d336741f24c177cd925fef8e0' into froyo-plus-aosp

* commit 'c162668e870cda9d336741f24c177cd925fef8e0':
  More framework tests cleanup.
 2010-04-01 21:50:00 -07:00
Brett Chabot
aabf8e227a Merge "More framework tests cleanup." into froyo 2010-04-01 21:45:41 -07:00
Mike Lockwood
86191d3d37 am a9e1a131: am 87e72cd3: Merge "Vibrate before shutting down." into froyo 
Merge commit 'a9e1a131e3a5dcde4d69ee9f99aee4702dcff909' into kraken

* commit 'a9e1a131e3a5dcde4d69ee9f99aee4702dcff909':
  Vibrate before shutting down.
 2010-04-01 21:15:11 -07:00
Mike Lockwood
73cd4a34ce am 87e72cd3: Merge "Vibrate before shutting down." into froyo 
Merge commit '87e72cd3b327fefc39030a628e9e9b7141791d39' into froyo-plus-aosp

* commit '87e72cd3b327fefc39030a628e9e9b7141791d39':
  Vibrate before shutting down.
 2010-04-01 21:12:56 -07:00
Mike Lockwood
300bcd79d9 Merge "Vibrate before shutting down." into froyo 2010-04-01 21:08:53 -07:00
Jim Miller
9ea314ce14 am 15be35f6: am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized. 
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken

* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
 2010-04-01 19:41:00 -07:00
Jim Miller
672708e2ea am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized. 
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp

* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
 2010-04-01 19:37:41 -07:00
Mike LeBeau
0ab0dc7285 am 3079afaa: am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by 
Merge commit '3079afaaf549316483a0f30d22eb157656ca7951' into kraken

* commit '3079afaaf549316483a0f30d22eb157656ca7951':
  Use flattenToShortString instead of toShortString on ComponentNames to
 2010-04-01 18:19:54 -07:00
Mike LeBeau
fc8d8fafaf am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentNam 
Merge commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp

* commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
  Use flattenToShortString instead of toShortString on ComponentNames to
 2010-04-01 18:14:30 -07:00
Mike LeBeau
6a569b5230 Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo 2010-04-01 18:11:43 -07:00
Charles Chen
53e5ab6ea0 am 9ea4668c: am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 
Merge commit '9ea4668c3fabba6d9b8e610030d2ba370b782e86' into kraken

* commit '9ea4668c3fabba6d9b8e610030d2ba370b782e86':
  Fix for bug 2564771 - pitch setting between apps can
 2010-04-01 18:05:21 -07:00
Charles Chen
44fd0cdaa8 am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 
Merge commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp

* commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
  Fix for bug 2564771 - pitch setting between apps can
 2010-04-01 17:59:57 -07:00
Charles Chen
71cc165645 Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 2010-04-01 17:56:47 -07:00
Yu Shan Emily Lau
4a255e3f19 am 948e7dc0: am e11bafec: Add the test template for the media audio manager test. 
Merge commit '948e7dc0ab6f0fae71fa76a438d084928d36569f' into kraken

* commit '948e7dc0ab6f0fae71fa76a438d084928d36569f':
  Add the test template for the media audio manager test.
 2010-04-01 17:50:53 -07:00
Mike LeBeau
137d468d33 am 2e1cd1cd: am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 
Merge commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1' into kraken

* commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1':
  Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
 2010-04-01 17:50:48 -07:00
Yu Shan Emily Lau
8d38784f10 am e11bafec: Add the test template for the media audio manager test. 
Merge commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48' into froyo-plus-aosp

* commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48':
  Add the test template for the media audio manager test.
 2010-04-01 17:43:27 -07:00
Mike LeBeau
c8be3a46af am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 
Merge commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp

* commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
  Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
 2010-04-01 17:42:38 -07:00
Mike LeBeau
4f44eece60 Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 2010-04-01 15:30:51 -07:00
Gilles Debunne
f5af832c20 am 55686d2c: am 83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo 
Merge commit '55686d2cdaa4e0e1d55a8cdd49dc871107cd54f7' into kraken

* commit '55686d2cdaa4e0e1d55a8cdd49dc871107cd54f7':
  Refactor in PositionTesterContextMenuListener.
 2010-04-01 14:53:19 -07:00
Gilles Debunne
59038a5547 am 83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo 
Merge commit '83d4eb6c4fc35bd8ce203edde0051d4def8c2cef' into froyo-plus-aosp

* commit '83d4eb6c4fc35bd8ce203edde0051d4def8c2cef':
  Refactor in PositionTesterContextMenuListener.
 2010-04-01 14:49:51 -07:00
Gilles Debunne
71475036eb Merge "Refactor in PositionTesterContextMenuListener." into froyo 2010-04-01 14:47:00 -07:00
Brett Chabot
7a6d2eeb5c am dbecc902: am f6118617: Merge "Remove FrameworkTest package." into froyo 
Merge commit 'dbecc90220e924fc8c693dd903679e0e9d562820' into kraken

* commit 'dbecc90220e924fc8c693dd903679e0e9d562820':
  Remove FrameworkTest package.
 2010-04-01 14:44:26 -07:00
Brett Chabot
46efee07d2 am f6118617: Merge "Remove FrameworkTest package." into froyo 
Merge commit 'f6118617350c0c1541550bf3a558460db562b6a4' into froyo-plus-aosp

* commit 'f6118617350c0c1541550bf3a558460db562b6a4':
  Remove FrameworkTest package.
 2010-04-01 14:40:43 -07:00
Fred Quintana
81deedc989 am 2aa2f78e: am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo 
Merge commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc' into kraken

* commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc':
  allow null authtokens to invalidateAuthToken
 2010-04-01 14:37:34 -07:00
Brett Chabot
6d5e502c08 Merge "Remove FrameworkTest package." into froyo 2010-04-01 14:36:36 -07:00
Fred Quintana
c5c4135a08 am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo 
Merge commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp

* commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a':
  allow null authtokens to invalidateAuthToken
 2010-04-01 14:32:51 -07:00
Fred Quintana
43974e6e4e Merge "allow null authtokens to invalidateAuthToken" into froyo 2010-04-01 14:27:00 -07:00
Derek Sollenberger
497a558e1c am 4c932079: am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive. 
Merge commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba' into kraken

* commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
 2010-04-01 12:10:03 -07:00
Derek Sollenberger
97bf7bfe16 am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive. 
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp

* commit '11fb6144604fbd1148695421e9ab6896701a431b':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
 2010-04-01 12:06:25 -07:00
Dirk Dougherty
2e5074f645 am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 
Merge commit '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken

* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
  doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
 2010-04-01 10:47:00 -07:00
James Dong
b2215d40b4 am d12d6c30: am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 
Merge commit 'd12d6c305caeea556781083152e741bdb3863eff' into kraken

* commit 'd12d6c305caeea556781083152e741bdb3863eff':
  Public API changes for CameraProfile and CamcorderProfile classes
 2010-04-01 10:46:57 -07:00