| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Update import path to SparseArray"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-dev | Siva Velusamy | 2013-07-29 | 2 | -2/+2 |
| |\ | |||||
| | * | Update import path to SparseArray | Siva Velusamy | 2013-07-29 | 2 | -2/+2 |
| |/ | | | | Change-Id: Idb9c5bba5e5c577496474d55ccf42794fc9aceff | ||||
| * | Merge "Change gradlew to place cache in android out dir."jb-mr1.1-dev-plus-aosp | Raphael Moll | 2013-07-16 | 2 | -2/+13 |
| |\ | |||||
| | * | Change gradlew to place cache in android out dir. | Raphael Moll | 2013-07-16 | 2 | -2/+13 |
| |/ | | | | Change-Id: Ia7226e1870ebc009293308eb6ee272f72eb870b2 | ||||
| * | Merge "Update version." | Xavier Ducrohet | 2013-07-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update version. | Xavier Ducrohet | 2013-07-11 | 1 | -1/+1 |
| |/ | | | | Change-Id: I4d34aa92bd1cc1e9727becc1bf085029d00e2f8d | ||||
| * | Merge "Workaround for an issue in settings.gradle" | Xavier Ducrohet | 2013-06-20 | 1 | -6/+6 |
| |\ | |||||
| | * | Workaround for an issue in settings.gradle | Xavier Ducrohet | 2013-06-20 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | Creating files in settings.gradle does not use the root project as the current dir which means that calling gradle from any folder that is not the root project fails to properly setup the project lists. Change-Id: If003f4c8df4ef832db834d458b4e73e0653a7b4e | ||||
| * | | Merge "Fixes error message string for Gradle plugin version." | Scott Barta | 2013-06-20 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fixes error message string for Gradle plugin version. | Scott Barta | 2013-06-19 | 1 | -1/+1 |
| |/ / | | | | | | | Change-Id: Ib29ea36406597957c00208c1e2c8ff0d25306f9c | ||||
| * | | Merge "Add parameters to request creation of a gradle-style project" | Scott Barta | 2013-06-20 | 2 | -7/+49 |
| |\ \ | |||||
| | * | | Add parameters to request creation of a gradle-style project | Jeff Smith | 2013-06-13 | 2 | -7/+49 |
| | | | | | | | | | | | | | | | | Change-Id: I78f87fe914aa5977b26bc6c4e94c88df0b5c1411 Signed-off-by: Jeff Smith <whydoubt@gmail.com> | ||||
| * | | | Merge "Add traceview IJ module" | Siva Velusamy | 2013-06-17 | 3 | -0/+38 |
| |\ \ \ | |||||
| | * | | | Add traceview IJ module | Siva Velusamy | 2013-06-14 | 3 | -0/+38 |
| |/ / / | | | | | | | | | | Change-Id: I5c74a0589bf3cd049dee2d9398824e1eaa1f6890 | ||||
| * | | | Merge "Change Eclipse compiler errors for null issues to warnings" | Tor Norbye | 2013-06-12 | 11 | -33/+33 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | Change Eclipse compiler errors for null issues to warnings | Tor Norbye | 2013-06-12 | 11 | -33/+33 |
| |/ / | | | | | | | Change-Id: I8526a8603733b4b8d809ddf5b9cfdb966ca70108 | ||||
| * | | Merge "Better tracking of differences in heap allocations" | Siva Velusamy | 2013-05-30 | 2 | -7/+90 |
| |\ \ | |||||
| | * | | Better tracking of differences in heap allocations | Siva Velusamy | 2013-05-30 | 2 | -7/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous change to track differences between two allocations was incorrect - it would change the allocation info itself. This CL fixes that by actually having a separate object that stores the differences in allocation count between two snapshots, but delegating to one of the snapshots for all other information. Change-Id: I7106a6b2060739db1b3e1d8c048ffc3d082a0d25 | ||||
| * | | | Merge "AVD Manager fix: warning instead of error for missing base system image." | Raphael Moll | 2013-05-30 | 1 | -27/+34 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | AVD Manager fix: warning instead of error for missing base system image. | Raphael Moll | 2013-05-29 | 1 | -27/+34 |
| |/ / | | | | | | | | | | | SDK Bug: 55835 Change-Id: I61121427e5c8df021e2bd4912dedd388906370c6 | ||||
| * | | Merge "Minor fixes to Native Heap Panel view" | Siva Velusamy | 2013-05-29 | 2 | -0/+24 |
| |\ \ | |||||
| | * | | Minor fixes to Native Heap Panel view | Siva Velusamy | 2013-05-29 | 2 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fixes the child count in the library view. 2. The diff view used to show stack traces where new allocations were made. But the amount of memory allocated was the cumulative sum of all allocations made at that stack trace, rather than just the amount allocated between the current and previous snapshots. We detect that situation and only show the newly allocated memory. Change-Id: I6edabf38b0c0758221983edf15e0d0b76154b962 | ||||
| * | | | Merge "Minor cleanups" | Siva Velusamy | 2013-05-29 | 2 | -36/+21 |
| |\| | | |/ |/| | |||||
| | * | Minor cleanups | Siva Velusamy | 2013-05-29 | 2 | -36/+21 |
| |/ | | | | | | Fixes a bunch of minor issues pointed out by code inspections. Change-Id: Ib4165e75ae93c2444120e2ff83913de2427afb17 | ||||
| * | Merge "Fix monkey dependencies." | Xavier Ducrohet | 2013-05-22 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix monkey dependencies. | Xavier Ducrohet | 2013-05-21 | 1 | -2/+2 |
| | | | | | | | | | Change-Id: I28b4a4f5d69038dee0728a71edf9c0ced53b3882 | ||||
| * | | Merge "Make AVD creation dialog resizeable." | Siva Velusamy | 2013-05-22 | 2 | -4/+11 |
| |\ \ | |||||
| | * | | Make AVD creation dialog resizeable. | Siva Velusamy | 2013-05-22 | 2 | -4/+11 |
| |/ / | | | | | | | | | | | | | | | | | There is no way to view longer warnings as they get truncated and cannot be viewed unless the dialog is resizeable. Fixes https://code.google.com/p/android/issues/detail?id=55511 Change-Id: Ifcdaf274f34299db1248c97819046d5d7a182374 | ||||
| * | | Merge "Add IDEA modules for sdkmanager" | Siva Velusamy | 2013-05-21 | 8 | -2/+108 |
| |\ \ | |/ |/| | |||||
| | * | Add IDEA modules for sdkmanager | Siva Velusamy | 2013-05-21 | 8 | -2/+108 |
| |/ | | | | Change-Id: I1000e8da48c9e08e1d0251c87871aeb8d3b329d7 | ||||
| * | Merge "Add IntelliJ swt project" | Siva Velusamy | 2013-05-20 | 27 | -0/+752 |
| |\ | |||||
| | * | Add IntelliJ swt project | Siva Velusamy | 2013-05-17 | 27 | -0/+752 |
| | | | | | | | | | | | | | | | | | | | Adds necessary modules to be able to launch DDMS. This requires two path variables: ANDROID_SDK: used by the run configuration SWT_PLATFORM: to pick up the correct swt.jar Change-Id: Id8a5e47798f972e706682dcd91db8fe6874e2df0 | ||||
| * | | Merge "Update sdk/avd manager icons." | Raphael Moll | 2013-05-14 | 26 | -0/+0 |
| |\ \ | |||||
| | * | | Update sdk/avd manager icons. | Raphael Moll | 2013-05-13 | 26 | -0/+0 |
| |/ / | | | | | | | Change-Id: Ib062b206557b7d1a55bc3a3d8d75c408250396a9 | ||||
| * | | Merge "AVD Manager: don't create an AVD if the system-image is missing." | Raphael Moll | 2013-05-09 | 1 | -12/+45 |
| |\ \ | |||||
| | * | | AVD Manager: don't create an AVD if the system-image is missing. | Raphael Moll | 2013-05-09 | 1 | -12/+45 |
| |/ / | | | | | | | | | | | | | | | | | When trying to create an AVD based on an addon, this checks that the system-image for the base platform actually exists. SDK Bug: 8889165 Change-Id: Ia542241e4cb82947a75b5f13076dee085cadc6b0 | ||||
| * | | Reconcile with tools_r22 | Conley Owens | 2013-05-08 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | Merge "Fix Chimpchat ImageUtilsTest" into tools_r22 | Raphael Moll | 2013-05-03 | 3 | -3/+104 |
| | |\ \ | |||||
| | | * | | Fix Chimpchat ImageUtilsTest | Raphael Moll | 2013-05-03 | 3 | -3/+104 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ImageUtilsTest tries to deserialize the image1.raw file from the resourcesi but this fails since it tries to recreate the old monkeyrunner RawImage class which has been replaced by the ChimRawImage since then. The fix is just to reimplement the obsolete class as-is so that deserialization can work properly. Both RawImage implementations are compatible and interchangeable. (cherry picked from commit a8764979fecc0b41e5525ded97bd4842a7556b48) Change-Id: I90b7eacbb529f1450087228f7cec285d7cd14521 | ||||
| | * | | Merge "SDK: fix sdkmanager tests." into tools_r22 | Raphael Moll | 2013-05-03 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | SDK: fix sdkmanager tests. | Raphael Moll | 2013-05-03 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing dependency on sdklib-test, which appeared once I removed the duplicated class SdkManagerTestCase which is defined in sdklib. (cherry picked from commit 1e1597858dbfdbb52b1a44a9667fe186d6e47e0d) Change-Id: I473bf1bb01441c17c9320823b4aa397f4b6c8d42 | ||||
| | * | | Merge "SDK Manager: ask for license when installing from command-line." into ↵ | Raphael Moll | 2013-04-16 | 3 | -54/+80 |
| | |\ \ | | | | | | | | | | | | | tools_r22 | ||||
| | | * | | SDK Manager: ask for license when installing from command-line. | Raphael Moll | 2013-04-16 | 3 | -54/+80 |
| | |/ / | | | | | | | | | | | | | | | | (cherry picked from commit 05d8426a7cd816873e1bf05c106c0b889210e214) Change-Id: Iaa7576f11b5d9d782cfb568002d61f79bf78a9d8 | ||||
| | * | | Merge "SDK Manager: remove duplicated classes, already in tools/base." into ↵ | Raphael Moll | 2013-04-13 | 2 | -381/+0 |
| | |\ \ | | | | | | | | | | | | | tools_r22 | ||||
| | | * | | SDK Manager: remove duplicated classes, already in tools/base. | Raphael Moll | 2013-04-12 | 2 | -381/+0 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | These were left overs from the sdk.git to tools/swt move. The classes are already in tools/base/sdklib. (cherry picked from commit 5a743937c2f28c9e81dda74e8e9c1c277c2a2c86) Change-Id: I3ff06a15e3c2994873ca6b9daceef7f5c6fc33e2 | ||||
| | * | | Merge "Fix SdkManager unit test, add build-tool support." into tools_r22 | Raphael Moll | 2013-04-13 | 2 | -68/+115 |
| | |\ \ | |||||
| | | * | | Fix SdkManager unit test, add build-tool support. | Raphael Moll | 2013-04-11 | 2 | -68/+115 |
| | |/ / | | | | | | | | | | | | | | | | (cherry picked from commit 10713b4184b028c0568bb608549c482fb32f8268) Change-Id: I9b9c448495a38ca6abdc3aa6b539ed5594814dcd | ||||
| | * | | Merge "Move resources out of src/main/java for Traceview. do not merge." ↵ | Xavier Ducrohet | 2013-04-08 | 3 | -0/+0 |
| | |\ \ | | | | | | | | | | | | | into tools_r22 | ||||
| | | * | | Move resources out of src/main/java for Traceview. do not merge. | Xavier Ducrohet | 2013-04-08 | 3 | -0/+0 |
| | |/ / | | | | | | | | | | | | | | | | (cherry picked from commit 39b33d0a025d03f42bc93e7ebf3bf5cc1859e161) Change-Id: Ie794b2affc5f5aa470bc32c7a22294d8a4895499 | ||||
| | * | | Merge "SDK Manager: fix jar path for windows android.bat" into tools_r22 | Raphael Moll | 2013-04-05 | 1 | -1/+1 |
| | |\ \ | |||||
 |
index : platform_tools_swt | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |