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

13918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Chen
df2fb836a9 am 36b205dc: am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken

* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:48:25 -07:00
Charles Chen
d0b2a29cd9 am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp

* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:45:30 -07:00
Dianne Hackborn
dc8c03a8b4 am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken

* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:42:09 -07:00
Dianne Hackborn
b64822a3ca am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp

* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:39:11 -07:00
Dianne Hackborn
f57216f124 Merge "Add a new intent category used for activities running in carmode." into froyo 2010-04-02 13:35:59 -07:00
Irfan Sheriff
9a8c69fbfa am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken

* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
  Dont start wifi if in airplane mode
 2010-04-02 12:53:49 -07:00
Suchi Amalapurapu
c66a143c81 am 21f15f68: am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 
Merge commit '21f15f68c2940a87954d9889e208ffbbed2c1995' into kraken

* commit '21f15f68c2940a87954d9889e208ffbbed2c1995':
  Handle exceptions when doing dexopt.
 2010-04-02 12:53:45 -07:00
Irfan Sheriff
65e79b2e6b am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp

* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
  Dont start wifi if in airplane mode
 2010-04-02 12:51:05 -07:00
Suchi Amalapurapu
1ec78f0ce3 am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 
Merge commit 'a77acab9c623a8b63b46d14686cf1a86dd863289' into froyo-plus-aosp

* commit 'a77acab9c623a8b63b46d14686cf1a86dd863289':
  Handle exceptions when doing dexopt.
 2010-04-02 12:51:01 -07:00
Irfan Sheriff
5cbb4dc9f7 Merge "Dont start wifi if in airplane mode" into froyo 2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
eeb2f83f02 Merge "Handle exceptions when doing dexopt." into froyo 2010-04-02 12:46:38 -07:00
Andreas Huber
2f1268db5e am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken

* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
  Support another kind of iso mpeg4 file.
 2010-04-02 11:26:55 -07:00
Andreas Huber
37c13661cd am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp

* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
  Support another kind of iso mpeg4 file.
 2010-04-02 11:21:34 -07:00
Andreas Huber
c8eafefc59 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Adam Powell
fd171639a4 am 1f29b4cd: am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f' into kraken

* commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:10:03 -07:00
Adam Powell
f1687bbec8 am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '219909224d9f5fdb4fe1c97fad048894c4619fe7' into froyo-plus-aosp

* commit '219909224d9f5fdb4fe1c97fad048894c4619fe7':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:06:34 -07:00
Daniel Sandler
a3193c2f15 am 750edffb: am 25642f0b: Merge "Make desk mode work again." into froyo 
Merge commit '750edffbc0fe528b93097f9ce909f446540cfff5' into kraken

* commit '750edffbc0fe528b93097f9ce909f446540cfff5':
  Make desk mode work again.
 2010-04-02 11:03:13 -07:00
Adam Powell
0538289113 Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:02:21 -07:00
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