summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am d6c0bb0f: merge from open-source masterThe Android Open Source Project2010-05-193-9/+4
|\
| * merge from open-source masterThe Android Open Source Project2010-05-193-10/+4
| |\
| | * Merge "Removed Calls to deprecated APIs"Romain Guy2010-05-193-11/+4
| | |\
| | | * Removed Calls to deprecated APIsChristian Mehlmauer2010-05-173-11/+4
* | | | Update NativeActivity to allow direct surface access.Dianne Hackborn2010-05-181-7/+26
* | | | am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
|\ \ \ \ | |/ / /
| * | | am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| |\ \ \
| | * \ \ Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| | |\ \ \
| | | * | | Removing STOPSHIP logs.Jaikumar Ganesh2010-05-181-1/+1
* | | | | | Add new API to take over a window's Surface.Dianne Hackborn2010-05-186-20/+179
* | | | | | am 4547e528: merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Removed Calls to deprecated APIs and unused ImportsChristian Mehlmauer2010-05-174-11/+4
| | | |_|/ | | |/| |
* | | | | am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | docs: fix markup errorScott Main2010-05-181-1/+2
* | | | | am fbb285e6: am e64256d6: Merge "docs: revise webview description and add inf...Scott Main2010-05-171-20/+103
|\ \ \ \ \ | |/ / / /
| * | | | am e64256d6: Merge "docs: revise webview description and add info for targeti...Scott Main2010-05-171-20/+103
| |\ \ \ \ | | |/ / /
| | * | | docs: revise webview description and add info for targeting screen densitiesScott Main2010-05-171-20/+103
* | | | | am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareS...Mike Lockwood2010-05-171-0/+26
|\ \ \ \ \ | |/ / / /
| * | | | am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder...Mike Lockwood2010-05-171-0/+26
| |\ \ \ \ | | |/ / /
| | * | | Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-171-0/+26
* | | | | resolved conflicts for merge of f7fb5331 to krakenJean-Baptiste Queru2010-05-171-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source masterThe Android Open Source Project2010-05-171-0/+16
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
* | | | | | Add camera focus distances API.Wu-cheng Li2010-05-151-0/+73
* | | | | | am 6d8e4fd8: am b83a283a: docs: add dev guide for backupScott Main2010-05-142-14/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b83a283a: docs: add dev guide for backupScott Main2010-05-142-14/+20
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | docs: add dev guide for backupScott Main2010-05-142-14/+20
* | | | | | am b1110149: merge from open-source masterThe Android Open Source Project2010-05-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-131-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Use integer for loop counter instead of floatKenny Root2010-05-131-1/+1
* | | | | | am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread t...Mike Lockwood2010-05-131-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logicMike Lockwood2010-05-131-4/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Use SystemClock.elapsedRealtime in ShutdownThread timeout logicMike Lockwood2010-05-131-4/+4
* | | | | | 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
* | | | | | | am 1a3b3d48: merge from open-source masterThe Android Open Source Project2010-05-136-8/+31
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | merge from open-source masterThe Android Open Source Project2010-05-136-8/+31
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Add some documentation about the thread safety of Cursor and some of the SQLi...Jeff Hamilton2010-05-126-8/+31
* | | | | | | am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" int...Costin Manolache2010-05-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyoCostin Manolache2010-05-121-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | 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
* | | | | | | | am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the defa...Grace Kloba2010-05-121-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim ...Grace Kloba2010-05-121-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | The default AlertDialog allows cancel. But the defaultGrace Kloba2010-05-121-0/+7
| | |/ / / / /
* | | | | | | am 4adacd23: merge from open-source masterThe Android Open Source Project2010-05-121-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge from open-source masterThe Android Open Source Project2010-05-121-0/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |