aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix build."Xavier Ducrohet2012-08-134-5/+4
|\
| * Fix build.Xavier Ducrohet2012-08-134-5/+4
|/ | | | | | For some reason "make sdk" doesn't build uiautomatorviewer? Change-Id: Ie390b8c517d4e5da1fbc9b13f56bf60812efecba
* Merge "More refactoring."Xavier Ducrohet2012-08-13253-664/+398
|\
| * More refactoring.Xavier Ducrohet2012-08-13253-664/+398
|/ | | | | | | Move stuff out of sdklib into common and ide_common. Remove androidprefs and move the one class into common. Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
* Merge "Fixed "Bus error" running tests triangleV2 and triangleCM"Andrew Hsieh2012-08-122-6/+14
|\
| * Fixed "Bus error" running tests triangleV2 and triangleCMAndrew Hsieh2012-08-102-6/+14
| | | | | | | | | | | | | | | | | | | | Function __dyld_func_lookup is deprecated and invisible in Mac SDK 10.6+. Instruct linker to resolve it at run-time. Related CL https://android-review.googlesource.com/#/c/37355/ fix the build, but cause run-time "Bus error". Change-Id: Icf3ea7a0b8ac29c69482e372f34e0b2e364472d8
* | Merge "Load devices defined in tools"Michael Wright2012-08-101-0/+9
|\ \
| * | Load devices defined in toolsMichael Wright2012-08-101-0/+9
| | | | | | | | | | | | Change-Id: Ib40dada5062e755b48bd3a62514ede14cef5ec1e
* | | Merge "Update devices.xml shipped with tools"Michael Wright2012-08-101-426/+381
|\ \ \ | |/ /
| * | Update devices.xml shipped with toolsMichael Wright2012-08-101-426/+381
| | | | | | | | | | | | | | | | | | | | | | | | Rather than containing the generic devices which are now packaged with ADT itself, it contains the nexus devices using the new device specification. Change-Id: I09b38b8166ba558800c2cf03150d8a3e9dd33a4f
* | | Merge "Fix build."Roman Nurik2012-08-101-1/+1
|\ \ \
| * | | Fix build.Roman Nurik2012-08-101-1/+1
|/ / / | | | | | | | | | | | | | | | Broken by Ic5992773207c92426a9f37409536d74b81dd645b Change-Id: Ifd19f71c1ebfa1a3aaf8f812eccbadaee27c8f90
* | | Merge "Disable padding for action bar icons created from clipart."Roman Nurik2012-08-102-2/+8
|\ \ \ | |/ / |/| |
| * | Disable padding for action bar icons created from clipart.Roman Nurik2012-08-082-2/+8
| | | | | | | | | | | | | | | | | | | | | This disables the automatic padding (target rectangle) used by the asset studio when using clipart as the source image. Change-Id: Ic5992773207c92426a9f37409536d74b81dd645b
* | | Merge "Force device list updates in the GLE to happen on the UI thread"Michael Wright2012-08-101-8/+17
|\ \ \
| * | | Force device list updates in the GLE to happen on the UI threadMichael Wright2012-08-091-8/+17
| | | | | | | | | | | | | | | | Change-Id: Ia9624f02c0ca62891b2c35c7d6bfe78130141e1b
* | | | Merge "Set default scaled screen size to device's screen size"Michael Wright2012-08-103-6/+34
|\ \ \ \ | |/ / /
| * | | Set default scaled screen size to device's screen sizeMichael Wright2012-08-093-6/+34
| | | | | | | | | | | | | | | | Change-Id: I6b169f0ef21d8f45da35dd10a7f76b30f3defcbb
* | | | Merge "Make AVDs repairable when the base device changes or is deleted"Michael Wright2012-08-1014-67/+250
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Make AVDs repairable when the base device changes or is deletedMichael Wright2012-08-0914-67/+250
|/ / | | | | | | Change-Id: I3b931ee511dc157320ca8658fe421fe28a1ff387
* | Merge "hv: Add more logging for when things go wrong."Siva Velusamy2012-08-092-0/+4
|\ \
| * | hv: Add more logging for when things go wrong.Siva Velusamy2012-08-092-0/+4
| | | | | | | | | | | | Change-Id: Idbb0a32507c19aadb11544342d73e1be7d1d4272
* | | Merge "Recommend java.lang.Math instead of android.util.FloatMath"Tor Norbye2012-08-094-65/+56
|\ \ \
| * | | Recommend java.lang.Math instead of android.util.FloatMathTor Norbye2012-08-094-65/+56
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Apparently java.lang.Math is faster than FloatMath now with the newer JITs. This reverses the old lint rule which would recommend using FloatMath instead of Math with the opposite recommendation, provided minSdkVersion is Froyo or greater. See issue 36199 for more. Change-Id: I362cb7da011d39f5620db96e113f8255a828d40b
* | | Merge "36175: Lint crashes with java.nio.BufferUnderflowException"Tor Norbye2012-08-092-10/+137
|\ \ \
| * | | 36175: Lint crashes with java.nio.BufferUnderflowExceptionTor Norbye2012-08-092-10/+137
|/ / / | | | | | | | | | | | | | | | | | | This CL adds some code to more gracefully handle problems with the Api Checker's binary cache. Change-Id: I02c86ab16b857b88df8945c84cb92c7217a6144a
* | | Merge "Fix fragment handling in templates"Tor Norbye2012-08-094-4/+15
|\ \ \
| * | | Fix fragment handling in templatesTor Norbye2012-08-084-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, pre-configure the layouts to use with fragments in the MasterDetailFlow templates. Second, add some fixes to correctly handle activities that use an @android:layout rather than a @layout/. Change-Id: Ib10e5a4bd645970a196d0afc57cee4663c4da895
* | | | Merge "Move kxml and layoutlib_api from plugin-adt up to plugin-base"Tor Norbye2012-08-086-9/+19
|\ \ \ \
| * | | | Move kxml and layoutlib_api from plugin-adt up to plugin-baseTor Norbye2012-08-086-9/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this there are runtime class loading failures in the layout editor since sdklib is in base and it refences layoutlib_api which in turn references kxml. Change-Id: I65a76a01266fe3608db9752104d3ae4e2a9d48b7
* | | | Merge "Update lint test project for common refactoring"Tor Norbye2012-08-083-6/+7
|\ \ \ \
| * | | | Update lint test project for common refactoringTor Norbye2012-08-083-6/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Id96616abe9be2a994b642808164b092c04ae8a0c
* | | | | Merge "Improvements to relative layout move and delete operations"Tor Norbye2012-08-0814-89/+883
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Improvements to relative layout move and delete operationsTor Norbye2012-08-0814-89/+883
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset improves the way the RelativeLayout editing support in the layout editor handles deletions and moves. First, during a move, if the move is simply within the same layout, then the layout constraints are left alone such that if you for example have A v B < C < D and you move B up to be next to A, you end up with A < B < C < D (It will however remove cycles if the move would result in them.) Second, it now handles deletion better where deleting a view will cause all references to any deleted views to be replaced by transitive constraints. For example, if you hve A < B < C < D and you delete B and C, you end up with A < D Change-Id: Icb9d3552e60aee20192f7941fe52be71ba52557f
* | | Merge "Refactor common.jar"Xavier Ducrohet2012-08-08211-278/+522
|\ \ \
| * | | Refactor common.jarXavier Ducrohet2012-08-07211-278/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move resources and com.android.util.Pair into layoutlib_api where they belong since layoutlib depends on them and we need to control the API. Made a copy of Pair to stay in common.jar but moved it to com.android.utils.Pair (the one in com.android.util.Pair is marked as deprecated to prevent usage where applicable). Also moved XmlUtil and PositionXmlParser to com.android.utils to match Pair. Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89
* | | | Merge "Make using GPU Emulation and Snapshots an error"Michael Wright2012-08-081-0/+7
|\ \ \ \
| * | | | Make using GPU Emulation and Snapshots an errorMichael Wright2012-08-071-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e77931a034af5d005e73c4f54818595c0720ab3
* | | | | Merge "Make missing devices.xml a warning rather than an error"Michael Wright2012-08-081-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Make missing devices.xml a warning rather than an errorMichael Wright2012-08-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since most users probably won't have custom devices, but instead use the ones we provide, it doesn't make sense to have the absence of a custom, user-specific devices.xml be an error instead of a warning. Change-Id: I9754be29e88377b8c2e594f1d790310da35897fc
* | | | | Merge "Add RAM, VM heap and internal storage size settings to AVDs"Michael Wright2012-08-082-13/+191
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Add RAM, VM heap and internal storage size settings to AVDsMichael Wright2012-08-072-13/+191
| | | | | | | | | | | | | | | | Change-Id: Idb8807e07fddc912144b962de0a01b729071c92b
* | | | Merge "Cleanup dos2unix in plugins *.java (ADT, GLd, NDK)"Raphael Moll2012-08-0817-1761/+1761
|\ \ \ \
| * | | | Cleanup dos2unix in plugins *.java (ADT, GLd, NDK)Raphael Moll2012-08-0717-1761/+1761
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic54d7e5b77bf6912b54855c5b30d8fcf790ff311
* | | | | Merge "Cleanup: dos2unix some files in SdkController."Raphael Moll2012-08-0818-3357/+3357
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Cleanup: dos2unix some files in SdkController.Raphael Moll2012-08-0718-3357/+3357
| | |/ | |/| | | | | | | Change-Id: I7d53dd01cc9fc25794ed10bf053f093a4dda9af3
* | | Merge "Look for extra templates under <vendor>/<package>"Tor Norbye2012-08-072-9/+48
|\ \ \
| * | | Look for extra templates under <vendor>/<package>Tor Norbye2012-08-072-9/+48
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template wizard looks for additional templates delivered separate from the tools in the extras/ folder. It was looking in extras/templates/, but it should really look under each package directory under each vendor directory within the extras folder and merge it all together. Change-Id: I6cdfe2b3d5206821ea8ef2e06027b527e978b2f5
* | | Merge "uiautomator: Misc cleanups"Siva Velusamy2012-08-079-547/+511
|\ \ \
| * | | uiautomator: Misc cleanupsSiva Velusamy2012-08-079-547/+511
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL performs a bunch of minor cleanups to allow reusing the UiAutomatorView from within an Eclipse view/editor. In particular: - The model is not a singleton anymore. It can be constructed based on an XML file, and is stored within the view. - References to the view from the model have all been removed. - All the view code from the application window class has been moved into a separate UiAutomatorView class. There is no new functionality, and from the UI perspective, there is only one change: The are now two toolbars, a global application level toolbar for global actions (open file, capture screenshot), and a toolbar above the view hierarchy that allows setting a couple of tree viewer options. Change-Id: Ib4fe98426c2f83de233091c23b080de4f9b7449a
generated by cgit v1.1 at 2024-12-24 18:15:29 +0000