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

7633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
f2d703adf0 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Mike Playle
a48c654e82 Fix glReadPixels() to verify that both x and y are non-negative. 2010-01-29 09:52:22 +00:00
Dirk Dougherty
aa51f1a242 Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair 2010-01-28 17:59:24 -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
Grace Kloba
642a0cb054 am 769ed21c: Fix http://b/issue?id=2400423. 
Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp

* commit '769ed21c33c3629411eb3bbf924de45737a18067':
  Fix http://b/issue?id=2400423.
 2010-01-27 12:30:19 -08:00
Dirk Dougherty
a1cfe958c6 am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp

* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
  doc change only: Update announcement and mwc redirect to point to microsite.
 2010-01-26 18:05:23 -08:00
Dirk Dougherty
ddacb39772 Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 2010-01-26 18:00:29 -08:00
Jim Miller
b4716b81a2 am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode. 
Merge commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp

* commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
 2010-01-26 13:55:16 -08:00
Robert Greenwalt
8c940c94fd am cc4b4016: Fix the reporting of NO_CONNECTIVITY. 
Merge commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp

* commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171':
  Fix the reporting of NO_CONNECTIVITY.
 2010-01-25 18:56:32 -08:00
Robert Greenwalt
83eda0c788 am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp

* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
  Refine fix I53e91db7 to apply only to wifi network
 2010-01-25 16:54:28 -08:00
Scott Main
781012c991 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 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp

* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
  docs: reference the history JS file with docRoot in order to
 2010-01-25 16:54:20 -08:00
Robert Greenwalt
06fb48ea18 Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 2010-01-25 16:50:10 -08:00
Scott Main
e3ec5eb95b 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 2010-01-25 15:39:46 -08:00
Mike Reed
6c2d9c241b am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp

* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
 2010-01-25 06:24:35 -08:00
Mike Reed
e14a1ad9cc Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Jim Miller
65c1cbfaa1 am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
 2010-01-22 20:23:37 -08:00
Jim Miller
4691ef5e0f Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 2010-01-22 20:19:12 -08:00
Dirk Dougherty
c11cc12776 am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp

* commit '8420795633443221627eb872aea8f2862a38f8b1':
  SDK doc change: Misc small fixes.
 2010-01-22 16:50:03 -08:00
Dirk Dougherty
db01bf12dc am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp

* commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-22 16:49:57 -08:00
Dirk Dougherty
79643e1692 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Dirk Dougherty
770a2991ab Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Dianne Hackborn
25e77b334f am 678e66a4: Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair 
Merge commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2' into eclair-plus-aosp

* commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2':
  Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed
 2010-01-22 15:51:02 -08:00
Dianne Hackborn
29513890e3 Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair 2010-01-22 15:47:08 -08:00
Dirk Dougherty
9c64b7d8da am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 
Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp

* commit '5d14cb34c0e9760340c15ac5faf2d76a64797117':
  doc change: add announce for developer lab at mwc. move adc to carousel.
 2010-01-22 14:28:05 -08:00
Dirk Dougherty
a2fa14097b Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 2010-01-22 14:23:39 -08:00
John Wang
e390ac7b9f am 098295a5: Merge "Updated emergency string when locale changes." into eclair 
Merge commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0' into eclair-plus-aosp

* commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0':
  Updated emergency string when locale changes.
 2010-01-22 13:20:25 -08:00
Grace Kloba
9b65699d11 am 5ff24d5d: DO NOT MERGE 
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp

* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
  DO NOT MERGE
 2010-01-22 13:17:52 -08:00
John Wang
0ac75bfa33 Merge "Updated emergency string when locale changes." into eclair 2010-01-22 13:17:25 -08:00
Eric Laurent
422068ab92 am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 
Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp

* commit 'a59551bade6a7b0c916c277f044de79c6af1bd22':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
 2010-01-22 10:25:00 -08:00
John Wang
9a6a4486c3 am 08cb0024: Handle emergency calls only status in ServiceStateTracker. 
Merge commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp

* commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8':
  Handle emergency calls only status in ServiceStateTracker.
 2010-01-22 10:24:47 -08:00
Eric Laurent
17739fe712 Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 2010-01-22 10:14:26 -08:00
Fred Quintana
8db9427d58 am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp

* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
  initialize sync adapters that get installed while the system is running
 2010-01-21 17:35:28 -08:00
jsh
ef32ea29b3 am 036e2108: Fix NPE when importing from USIM. 
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp

* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
  Fix NPE when importing from USIM.
 2010-01-21 17:35:18 -08:00
Fred Quintana
4910d5fb2e Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
Yu Shan Emily Lau
94481bfd87 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 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp

* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
  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-21 15:14:36 -08:00
Eric Fischer
202b2b540b am 50adb167: Pull in "emergency calls only" translations. 
Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp

* commit '50adb167534889421dc0d7cfc7d3bf663c03f01c':
  Pull in "emergency calls only" translations.
 2010-01-21 15:14:30 -08:00
Yu Shan Emily Lau
c125c2cd7c 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 2010-01-21 15:07:51 -08:00
John Wang
b119686b3d am 7f70998d: Merge "Add Emergency Calls Only String." into eclair 
Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp

* commit '7f70998dec6d7db850373b7e75677ecf72904878':
  Add Emergency Calls Only String.
 2010-01-21 14:06:35 -08:00
John Wang
402dce2453 Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Wei Huang
72f98a9314 am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp

* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
 2010-01-21 12:28:08 -08:00
Wei Huang
34c0d1e324 Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 2010-01-21 12:21:11 -08:00
The Android Open Source Project
7f57368008 merge from open-source master 2010-01-21 11:21:25 -08:00
Ying Wang
631cd7a7ff am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair 
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.
 2010-01-21 11:12:29 -08:00
Ying Wang
936155884a Merge "Find layout classes in all "layout-*" dirs." into eclair 2010-01-21 11:07:14 -08:00
Robert Greenwalt
c257d866cb am 9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair 
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp

* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
  Try to switch to another default net on connection failure.
 2010-01-21 10:05:13 -08:00
Robert Greenwalt
315503b59b Merge "Try to switch to another default net on connection failure." into eclair 2010-01-21 09:57:46 -08:00
Irfan Sheriff
da734680cc am dcc14d6a: Merge "Use MCC value to always override channel count setting" into eclair 
Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp

* commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
  Use MCC value to always override channel count setting
 2010-01-21 07:52:52 -08:00
Irfan Sheriff
fd94379c35 Merge "Use MCC value to always override channel count setting" into eclair 2010-01-21 07:46:49 -08:00
Grace Kloba
9be6891f33 am f6aed0e0: Merge "DO NOT MERGE" into eclair 
Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp

* commit 'f6aed0e0a7c96094b66f5426baad78032b794497':
  DO NOT MERGE
 2010-01-20 23:34:42 -08:00