summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* Add new API to take over a window's Surface.Dianne Hackborn2010-05-186-20/+179
| | | | Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
* am 4547e528: merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
|\ | | | | | | | | | | | | Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken * commit '4547e5284e79192373f3a6bb6c452501171bc1d6': Removed Calls to deprecated APIs and unused Imports
| * merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
| |\ | | | | | | | | | Change-Id: I3607454a9257701855354c12ef1f36841c889aea
| | * Removed Calls to deprecated APIs and unused ImportsChristian Mehlmauer2010-05-174-11/+4
| | | | | | | | | | | | Change-Id: Ib26783ca1d6c345cc91aa3ab5b9654f5316c78a0
* | | am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken * commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca': docs: fix markup error
| * | am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp * commit '5f1d100298dfafbd996b6deff457e6d1de4008a0': docs: fix markup error
| | * | docs: fix markup errorScott Main2010-05-181-1/+2
| | | | | | | | | | | | | | | | Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
* | | | am fbb285e6: am e64256d6: Merge "docs: revise webview description and add ↵Scott Main2010-05-171-20/+103
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | info for targeting screen densities" into froyo Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken * commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9': docs: revise webview description and add info for targeting screen densities
| * | | am e64256d6: Merge "docs: revise webview description and add info for ↵Scott Main2010-05-171-20/+103
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | targeting screen densities" into froyo Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp * commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49': docs: revise webview description and add info for targeting screen densities
| | * | docs: revise webview description and add info for targeting screen densitiesScott Main2010-05-171-20/+103
| | | | | | | | | | | | | | | | Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
* | | | am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete ↵Mike Lockwood2010-05-171-0/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | IHardwareService Binder API. Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken * commit '3e9e9696f147c8df1236c1d7aa9496124864a81c': Resurrect flashlight support in obsolete IHardwareService Binder API.
| * | | am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService ↵Mike Lockwood2010-05-171-0/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binder API. Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp * commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f': Resurrect flashlight support in obsolete IHardwareService Binder API.
| | * | Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-171-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid flashlight apps that had been using reflection to access this API after this class was removed after eclair. Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | resolved conflicts for merge of f7fb5331 to krakenJean-Baptiste Queru2010-05-171-0/+16
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
| * | | merge from open-source masterThe Android Open Source Project2010-05-171-0/+16
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
| | * | Merge "Fixing indeterminate progress bar animation state."Romain Guy2010-05-151-0/+16
| | |\ \
| | | * | Fixing indeterminate progress bar animation state.David Sobreira Marques2010-05-151-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing a progress bar instance more than once it will not animate after the first time. Change-Id: I5104c551d561755005e533f2ab5257454567bf71 Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
* | | | | Add camera focus distances API.Wu-cheng Li2010-05-151-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications can use this API to estimate the distance between the subject and the camera. bug:1955650 Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
* | | | | am 6d8e4fd8: am b83a283a: docs: add dev guide for backupScott Main2010-05-142-14/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken * commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf': docs: add dev guide for backup
| * | | | am b83a283a: docs: add dev guide for backupScott Main2010-05-142-14/+20
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp * commit 'b83a283ac178ab0a72f1d811189d79b26097835e': docs: add dev guide for backup
| | * | | docs: add dev guide for backupScott Main2010-05-142-14/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
* | | | | am b1110149: merge from open-source masterThe Android Open Source Project2010-05-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken * commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9': Use integer for loop counter instead of float New test in FrameworkTest for the VelocityTracker class Preserve '+' in phone numbers imported from SIM.
| * | | | merge from open-source masterThe Android Open Source Project2010-05-131-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
| | * | | Use integer for loop counter instead of floatKenny Root2010-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
* | | | | am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread ↵Mike Lockwood2010-05-131-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout logic Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken * commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
| * | | | am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logicMike Lockwood2010-05-131-4/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp * commit '098e58da93f304d7d7791f193c6237870b94989d': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
| | * | | Use SystemClock.elapsedRealtime in ShutdownThread timeout logicMike Lockwood2010-05-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids problems if the time is reset while shutting down. Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into krakenJaikumar Ganesh2010-05-133-19/+66
|\ \ \ \ \
| * | | | | Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING.Daisuke Miyakawa2010-05-103-19/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes using PhoneNumberUtils takes unexpected side effects. For example, PAUSE mark (#) is removed and operation on the phone number does not work well in some devices. I also concern removing the PhoneNumberUtils logic since some other mobile phones cannot understand # or alphabets and starts emitting errors after the modification. I'll add a flag instead of just removing the code and let users choose it. Bug: 2329952 Change-Id: I4ffdd01ebb8ac320b8b67a5848a747af13c6ad1a
* | | | | | am 1a3b3d48: merge from open-source masterThe Android Open Source Project2010-05-136-8/+31
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken * commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4': Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-136-8/+31
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
| | * | | | Add some documentation about the thread safety of Cursor and some of the ↵Jeff Hamilton2010-05-126-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLite* classes. Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
* | | | | | am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" ↵Costin Manolache2010-05-121-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken * commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02': Bug 2680071: Rename the Cloud to Device
| * | | | | am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyoCostin Manolache2010-05-121-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp * commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e': Bug 2680071: Rename the Cloud to Device
| | * | | | Merge "Bug 2680071: Rename the Cloud to Device" into froyoCostin Manolache2010-05-121-1/+1
| | |\ \ \ \
| | | * | | | Bug 2680071: Rename the Cloud to DeviceCostin Manolache2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
* | | | | | | am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the ↵Grace Kloba2010-05-121-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken * commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27': The default AlertDialog allows cancel. But the default
| * | | | | | am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim ↵Grace Kloba2010-05-121-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp * commit '336d7dcb105a43ee4de51fd0f26f277c63662f02': The default AlertDialog allows cancel. But the default
| | * | | | | The default AlertDialog allows cancel. But the defaultGrace Kloba2010-05-121-0/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSConfim doesn't have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. Fix http://b/issue?id=2679139
* | | | | | am 4adacd23: merge from open-source masterThe Android Open Source Project2010-05-121-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken * commit '4adacd23d4c91569b16fe50419f1a91f68d805bd': Add support for EVDO Rev B
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-121-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
| | * | | | Add support for EVDO Rev BNaveen Kalla2010-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
| | * | | | Added WEB_URL_PATTERN for Montenegro ".me"Simon Schoar2010-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If725c5ee08ed840ae8323fa18b1d82ef2a42db87
* | | | | | am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyoCostin Manolache2010-05-121-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken * commit '625de488973f262e56d3ee6825a8cf1ebaee089b': Bug 2673557: rename datamessaging
| * | | | | am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyoCostin Manolache2010-05-121-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp * commit 'e2055fe4258f8085a88328579c852ec26d77bb10': Bug 2673557: rename datamessaging
| | * | | | Merge "Bug 2673557: rename datamessaging" into froyoCostin Manolache2010-05-111-1/+1
| | |\ \ \ \
| | | * | | | Bug 2673557: rename datamessagingCostin Manolache2010-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
* | | | | | | am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: ↵Keith Ito2010-05-111-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken * commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4': Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
| * | | | | | am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in ↵Keith Ito2010-05-111-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uri.getQueryParameter" into froyo Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp * commit 'be65399baf23855094596e27c25763ff92e9e027': Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
| | * | | | | Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in ↵Keith Ito2010-05-101-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Uri.getQueryParameter" into froyo