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

12239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
cbda0e4773 Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView." 2010-01-28 21:24:10 -08:00
Irfan Sheriff
ff22ba3c87 Merge "Blacklist APs instead of disable" 2010-01-28 20:46:25 -08:00
Tom Taylor
c3b9f0e63c Remove MMS from the framework 
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.

Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
 2010-01-28 16:59:27 -08:00
Dirk Dougherty
1862bb262b am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a'

* commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:52:43 -08:00
Dirk Dougherty
f1e2b83c0a am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp

* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:46:54 -08:00
Dirk Dougherty
d08c5fb5c8 Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 2010-01-28 16:40:56 -08:00
Jean-Baptiste Queru
e5f0548de9 resolved conflicts for merge of bb074ef9 to master 
Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
 2010-01-28 15:21:25 -08:00
Dirk Dougherty
162d55decd am 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 
Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d'

* commit '67a658567a6bad898c097e615f8efcb3c91fa50d':
  doc change only: Update announcement and mwc redirect to point to microsite.
 2010-01-28 15:10:19 -08:00
Eric Laurent
4290533f31 Merge "Remove verbose log from AudioPolicyManagerBase." 2010-01-28 15:01:42 -08:00
Jim Miller
574db0a530 am fbf977be: am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode. 
Merge commit 'fbf977be5471a81b664bfc0a048497f268688a17'

* commit 'fbf977be5471a81b664bfc0a048497f268688a17':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
 2010-01-28 14:57:03 -08:00
Robert Greenwalt
c8af1c3c4f am 3e229076: am cc4b4016: Fix the reporting of NO_CONNECTIVITY. 
Merge commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c'

* commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c':
  Fix the reporting of NO_CONNECTIVITY.
 2010-01-28 14:46:55 -08:00
Andreas Huber
fe453175e0 Merge "Support the specification of additional HTTP headers in the creation of a DataSource." 2010-01-28 14:18:19 -08:00
Adam Powell
04a8e1b64d Merge "ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller." 2010-01-28 14:03:15 -08:00
Jesse Wilson
b1e334a237 Merge "Fix the broken compile of a currently-not-being-compiled AWT class." 2010-01-28 14:00:48 -08:00
Robert Greenwalt
d47a612aaa am 6d626d41: am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 
Merge commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0'

* commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0':
  Refine fix I53e91db7 to apply only to wifi network
 2010-01-28 13:44:45 -08:00
Scott Main
f0aca02acb am 9985feca: am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 
Merge commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174'

* commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174':
  docs: reference the history JS file with docRoot in order to
 2010-01-28 13:44:35 -08:00
Eric Laurent
7ccc09a4f3 Remove verbose log from AudioPolicyManagerBase. 2010-01-28 13:42:59 -08:00
Mike Reed
638247d438 am b2244690: (-s ours) am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 
Merge commit 'b22446901c477f40863132a9617368852d358f64'

* commit 'b22446901c477f40863132a9617368852d358f64':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
 2010-01-28 13:42:31 -08:00
Jean-Baptiste Queru
0f5bcea6f5 Merge "resolved conflicts for merge of 33ca1f32 to master" 2010-01-28 13:19:56 -08:00
Kenny Root
43a4014c04 resolved conflicts for merge of 33ca1f32 to master 
Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f
 2010-01-28 13:16:19 -08:00
Andreas Huber
7843ced36a Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played." 2010-01-28 12:56:17 -08:00
Dirk Dougherty
a565f69ca8 am 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a'

* commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a':
  SDK doc change: Misc small fixes.
 2010-01-28 12:37:21 -08:00
Dirk Dougherty
6dfb94dcb7 am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8'

* commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-28 12:37:10 -08:00
Brian Carlstrom
d7357c773c Merge "Issue 1597: browser crash possibly related to invalid SSL certificate" 2010-01-28 12:33:27 -08:00
Jesse Wilson
fbdd5771f2 Fix the broken compile of a currently-not-being-compiled AWT class. 
I intend to remove AWT entirely, but doing so is a large project and
this stopgap will remove several errors from Eclipse projects.
 2010-01-28 12:31:01 -08:00
Kenny Root
593154dde5 resolved conflicts for merge of b0903104 to master 
Change-Id: Iff20980c44d42b41ae411c4201e0927cee19d415
 2010-01-28 12:03:49 -08:00
Andreas Huber
d4461e7664 API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played. 
related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
 2010-01-28 11:52:43 -08:00
Dirk Dougherty
fb32018a82 am 97ca28cd: am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 
Merge commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9'

* commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9':
  doc change: add announce for developer lab at mwc. move adc to carousel.
 2010-01-28 10:48:15 -08:00
John Wang
0515c9dc5b am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair 
Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

* commit '89fec7b155981d6e99eb1e05793f343a5d04aa59':
  Updated emergency string when locale changes.
 2010-01-28 10:47:27 -08:00
Grace Kloba
dea3af75f5 am 4f01c927: (-s ours) am 5ff24d5d: DO NOT MERGE 
Merge commit '4f01c927503401d560cb4f209b7d9a723c32e8cb'

* commit '4f01c927503401d560cb4f209b7d9a723c32e8cb':
  DO NOT MERGE
 2010-01-28 10:47:15 -08:00
Eric Laurent
2734f183dd am 131c5e08: am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 
Merge commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391'

* commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
 2010-01-28 10:09:09 -08:00
John Wang
5c9631d607 am 64c92f75: am 08cb0024: Handle emergency calls only status in ServiceStateTracker. 
Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'

* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
  Handle emergency calls only status in ServiceStateTracker.
 2010-01-28 10:08:55 -08:00
Grace Kloba
f2bbbde318 Merge "Need to check parent for performLongClick() as it is the result of a delayed message." 2010-01-28 09:14:52 -08:00
Patrick Scott
16944ca858 Merge "First pass at the url rendering service." 2010-01-28 08:32:43 -08:00
Andy McFadden
c54b52c412 Merge "Add streaming method profiling support." 2010-01-28 07:27:32 -08:00
San Mehat
c07e63ecb5 Merge "Remove destroy asec command when mounting secure container" 2010-01-28 06:50:18 -08:00
Jacek Surazski
34d8359e1b Merge "timestamp field in ApplicationErrorReport was not getting intitialized on ANRs" 2010-01-28 00:09:56 -08:00
Romain Guy
422cfc9c16 Merge "Added OverScroller and overscroll effects for ScrollView and HorizontalScrollView." 2010-01-27 22:00:44 -08:00
Fred Quintana
3598750566 am 6f3e1e27: am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 
Merge commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5'

* commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5':
  initialize sync adapters that get installed while the system is running
 2010-01-27 18:40:11 -08:00
jsh
77b9322000 am 3c2d3667: am 036e2108: Fix NPE when importing from USIM. 
Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d'

* commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d':
  Fix NPE when importing from USIM.
 2010-01-27 18:39:58 -08:00
Yu Shan Emily Lau
8a6cc7427e am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 
Merge commit '47f1d4d509b271ddb2f158c761e572413f39f1a8'

* commit '47f1d4d509b271ddb2f158c761e572413f39f1a8':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
 2010-01-27 17:27:41 -08:00
Eric Fischer
534fd8a04d am ad0e5363: am 50adb167: Pull in "emergency calls only" translations. 
Merge commit 'ad0e53635571066e7928e30a4a669067fff6a382'

* commit 'ad0e53635571066e7928e30a4a669067fff6a382':
  Pull in "emergency calls only" translations.
 2010-01-27 17:27:23 -08:00
John Wang
f83ef4ee4f am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair 
Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918'

* commit '97fdd0aba93f7c609c1194edf636805ff70e4918':
  Add Emergency Calls Only String.
 2010-01-27 17:26:40 -08:00
Wei Huang
4ccc94b956 am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 
Merge commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3'

* commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
 2010-01-27 16:29:10 -08:00
Andreas Huber
2cb4f162c6 Merge "Fix http streaming for shoutcast servers that do not support http ranges." 2010-01-27 16:25:05 -08:00
Romain Guy
d514ebdf9b resolved conflicts for merge of 176a88ff to master 2010-01-27 16:20:49 -08:00
Romain Guy
b75dae4881 Merge "New View.dispatchDisplayHint() API. Bug #2399147" 2010-01-27 15:54:06 -08:00
Ying Wang
50674f0f3a am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair 
Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e'

* commit '6efe03b19e0734361b262f9a0be4d225088d7f9e':
  Find layout classes in all "layout-*" dirs.
 2010-01-27 15:53:20 -08:00
Owen Lin
0fdc5c1816 Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions in preference manager." 2010-01-27 15:48:26 -08:00
Suchi Amalapurapu
db877bcb17 Merge "Add asec permission to DefaultContainerService" 2010-01-27 15:46:32 -08:00