ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
14,329 Commits 2 Branches 0 Tags 54 MiB
7cbfdedc90
Commit Graph

14329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dirk Dougherty
6025796ec2 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 '2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp

* commit '2d8234b73d11fdc2178232cabad3ffaa23723405':
  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:40:15 -07:00
James Dong
5627f6093a am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 
Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp

* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
  Public API changes for CameraProfile and CamcorderProfile classes
 2010-04-01 10:40:11 -07:00
Dirk Dougherty
805fc9d373 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 2010-04-01 10:35:21 -07:00
James Dong
5bc3f94b99 Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 2010-04-01 10:33:45 -07:00
Robert Greenwalt
15d3fb1e18 am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit 'cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken

* commit 'cab133a7fa39969f136e3f401f97f6ce843514bb':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:27:04 -07:00
Robert Greenwalt
87f083fc8d am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp

* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:22:51 -07:00
Robert Greenwalt
e146999bc8 Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
5969285a3c am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken

* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
  Fix for bug 2558156: Encodig is null
 2010-04-01 10:00:08 -07:00
Kristian Monsen
08326ed4e4 am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp

* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
  Fix for bug 2558156: Encodig is null
 2010-04-01 09:57:12 -07:00
Kristian Monsen
97ad6b7683 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Dave Sparks
f96f63d9ce am 5100df84: am 49e5a4c5: Update AMR codec. 
Merge commit '5100df844c209b93b912917fad3e402e00241210' into kraken

* commit '5100df844c209b93b912917fad3e402e00241210':
  Update AMR codec.
 2010-04-01 09:51:42 -07:00
Dave Sparks
ca08c653bb am 49e5a4c5: Update AMR codec. 
Merge commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26' into froyo-plus-aosp

* commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26':
  Update AMR codec.
 2010-04-01 09:47:58 -07:00
Ben Murdoch
09c5ec7796 am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken

* commit 'bf6913481eff68a69d1e6ba312227e2fcea29793':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:47:58 -07:00
Ben Murdoch
9859ba197a am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:44:58 -07:00
Ben Murdoch
057779af45 Merge changes Ic9531e3c,I3f04433b into froyo 
* changes:
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:42:14 -07:00
Grace Kloba
798304e752 am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken

* commit 'fe72c533fe210e147111e0a862360032365dd987':
  As we don't support over scroll any more, we need
 2010-04-01 08:20:48 -07:00