aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* hv: Add more logging for when things go wrong.Siva Velusamy2012-08-092-0/+4
| | | | Change-Id: Idbb0a32507c19aadb11544342d73e1be7d1d4272
* 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
* | am f9344c0e: (-s ours) am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release ↵The Android Open Source Project2012-08-070-0/+0
|\ \ | |/ | | | | | | | | - do not merge * commit 'f9344c0eeacad791fe10a5d1ffc05de2187bf0c6':
| * am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ |/ / | | | | * commit '5a6f9b19b8312b8044fb2ec288dc7839a937d87f':
| * Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ |/ / | | | | Change-Id: Ibc03cf4f09d43ac60612f0c711794165f50494f8
| * merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-070-0/+0
| |\
* | \ Merge "Catch exceptions during class initialization."Tor Norbye2012-08-071-22/+26
|\ \ \
| * | | Catch exceptions during class initialization.Tor Norbye2012-08-071-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This primarily fixes running various unit tests that are accessing this class (to test static methods) but fail because class initialization looking for icons fails when not running as a plugin test. Change-Id: I77d62215f34ab8c8ed4c7ee96b9e6669d0468085
* | | | Merge "Convert EOL from dos2unix in sdkuilib *.java"Raphael Moll2012-08-0727-7620/+7620
|\ \ \ \
| * | | | Convert EOL from dos2unix in sdkuilib *.javaRaphael Moll2012-08-0727-7620/+7620
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia046d63aac7800326effbe61364d2efa35581633
* | | | | Merge "Convert EOL from Windows to Unix in sdklib *.java"Raphael Moll2012-08-0772-18556/+18612
|\ \ \ \ \ | |/ / / /
| * | | | Convert EOL from Windows to Unix in sdklib *.javaRaphael Moll2012-08-0772-18556/+18612
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a "dos2unix" applied to all the sdklib *.java files. I meant to clean that a while ago. I'll do sdkuilib in a different CL. Change-Id: I5c7d65cea9205d8765961db0fea42d8b3dbd58eb
* | | | | Merge "Include status-bar node when writing out Device's software"Michael Wright2012-08-071-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Include status-bar node when writing out Device's softwareMichael Wright2012-08-071-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I973d454d040ab537e10727f16f70270dc0bae7ce
* | | | | Merge "Invoke formatter on newly created or merged template files"Tor Norbye2012-08-072-13/+62
|\ \ \ \ \
| * | | | | Invoke formatter on newly created or merged template filesTor Norbye2012-08-062-13/+62
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I0d8185381d80b7810d1f6271703b1fc71e35ec83
* | | | | Merge "Asset studio fixes"Tor Norbye2012-08-077-15/+54
|\ \ \ \ \
| * | | | | Asset studio fixesTor Norbye2012-08-067-15/+54
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating actionbar icons from clipart, do not strip surrounding space, and do not add extra padding. The clipart images already contain baked in padding suitable for action bar icons. This CL also makes sure the UI disables the corresponding options in this mode. It also renames and moves to the bottom the legacy menu and tab icon generators, and fixes a file resource leak in the image loading code. Change-Id: I8a0dd61c97862206cdc71dc591a207a0b6a050f8
* | | | | Merge "Update lint unit test golden files to contain more details"Tor Norbye2012-08-0762-761/+1893
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update lint unit test golden files to contain more detailsTor Norbye2012-08-0662-761/+1893
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lint golden files was using a custom unit test reporter which wrote out the test strings in alphabetical order. However, this output was missing some information such as the actual source lines containing the error and the particular error range underlined, which the CLI prints. This changeset replaces the unit test reporter with the CLI one, which not only has the benefit of providing more details in the unit tests (which for example shows that bytecode based issues correctly identify the right source level range), but it also tests the CLI reporter itself such as its sorting. Other than a minor fix to handling \r's in the CLI error output, this changeset does not contain any changes to any of the lint detectors, it just updates the golden files. Change-Id: Iae8f13a47efe6ba5e5cfd84af0dd548f78513879
* | | | | Merge "uiautomator: fix launch script"Siva Velusamy2012-08-063-18/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | uiautomator: fix launch scriptSiva Velusamy2012-08-063-18/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I9bc5007f1267dddaae351e8003d14d89f1fd26c9
* | | | | Merge "Java implementation of bspatch."Raphael Moll2012-08-061-0/+533
|\ \ \ \ \
| * | | | | Java implementation of bspatch.Raphael Moll2012-08-041-0/+533
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I994ea6499c542fe43b16037e4a8cf184b95f91de
* | | | | | Merge "SDK Manager: allow user URLs to point to sys-img.xml too."Raphael Moll2012-08-061-1/+15
|\ \ \ \ \ \
| * | | | | | SDK Manager: allow user URLs to point to sys-img.xml too.Raphael Moll2012-08-021-1/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "user defined sites" code originally only dealt with add-on XML sources. Now we'd like it to deal with system-image sources too, but we don't know which kind of object it is (at least not without trying to fetch it.) As a temporary workaround, just take a guess based on the leaf URI name. However ideally what we should simply do is add a checkbox "is system-image XML" in the user dialog and pass this info down here. Another alternative is to make a "dynamic" source object that tries to guess its type once the URI has been fetched. Change-Id: I019d1b0dee56a587bc917c9141ca4bd052e55876
* | | | | | Merge "Fix Asset Studio tests by adding back Bugdroid clipart."Roman Nurik2012-08-062-0/+0
|\ \ \ \ \ \
| * | | | | | Fix Asset Studio tests by adding back Bugdroid clipart.Roman Nurik2012-08-062-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50a82edca0e24326da8666c8d2a7080bfe6168bc
* | | | | | | Merge "Increment count when backing up bad devices.xml"Michael Wright2012-08-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Increment count when backing up bad devices.xmlMichael Wright2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where if you had devices.xml.old.0 in ~/.android, then the DeviceManager would spin in an infinite loop because the count wouldn't be incremented each time. Change-Id: I525a0da120205ffb9e507bf1a83cb02f077ba76d
* | | | | | | | Merge "Added status bar qualifier to device schema"Michael Wright2012-08-0612-3/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Added status bar qualifier to device schemaMichael Wright2012-08-0612-3/+49
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since some tablets have a status bar at the top and others don't, we need to be able to configure this by API level for the GLE. Change-Id: I8c4fd7adb89636173421489f8a136d541d3de4eb
* | | | | | | Merge "Replace asset studio clipart with action bar icon pack."Roman Nurik2012-08-06328-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Replace asset studio clipart with action bar icon pack.Roman Nurik2012-08-06328-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces all current clipart for the Asset Studio with icons from the Action Bar Icon Pack on developer.android.com/design/downloads. Change-Id: I8d1307567602ebcadd5c2f2e043580ba94dc5614
* | | | | | | Merge "ndk: Remove redundant implementation of IShellOutputReceiver"Siva Velusamy2012-08-061-33/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | ndk: Remove redundant implementation of IShellOutputReceiverSiva Velusamy2012-08-061-33/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Change-Id: I43add9790edf1418cd821f3486035f495fe45ad2
* | | | | | Merge "35875: Lint too strict about translating strings by default."Tor Norbye2012-08-0610-10/+172
|\ \ \ \ \ \
| * | | | | | 35875: Lint too strict about translating strings by default.Tor Norbye2012-08-0610-10/+172
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset updates the issue explanation for the translation detector to explain the translatable=false and donottranslate.xml mechanisms to handle non-translatable strings. It adds a quickfix for missing translation items to set the translatable attribute to false. It also makes lint warn where you're using translatable=false on strings in a locale-folder, as well as when you're translating a string defined as translatable=false in the base folder. And finally it also bumps up the severity of the extra translations issue as justified in issue 35875. Change-Id: I7539464b234b0a4b444bf9f188ce5b819f962430
* | | | | | Merge "Allow lint cli --sources to specify a path, and use from ant lint"Tor Norbye2012-08-068-89/+119
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow lint cli --sources to specify a path, and use from ant lintTor Norbye2012-08-068-89/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, this changeset allows the arguments passed to --sources and --classpath (renamed from --classes) to specify not just a directory, but to specify a path as well. This might make it easier to invoke lint from scripts if you have a path variable, so you don't have to split it into multiple arguments. Second, it makes the lint task in ant use these, such that any build.xml customizations to the source paths or class paths are automatically used rather than relying on lint's default structure check. Change-Id: Id8e4caf0010d7fd7245844b3099b5dc0607f0aba
* | | | | | Merge "Add support for additional languages in the typo detector"Tor Norbye2012-08-0620-152/+7117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add support for additional languages in the typo detectorTor Norbye2012-08-0320-152/+7117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checkin adds typo databases for six additional languages, as well as several fixes to the infrastructure. First, it now supports "globbing", since for example the German typo database contains glob patterns of the form "asymetrisch*->asymmetrisch*". Second, it supports multiword typos (such as "all zu->allzu") which caused some complications (since this means that the typo detector can match beyond the word boundary it was passed in). Third, it adds a bunch of validation code to the type dictionaries, which uncovered a bunch of inconsistencies (duplicate entries, using "-" instead of "->" for some separators, etc). There's now a unit test which produces a cleaned up version of each dictionary file, as well as tests to ensure that the ASCII and the UTF-8 comparison methods are in sync (and this uncovered some bugs which were fixed.) Finally, it fixes the HTML reporter such that it properly handles UTF-8. Change-Id: Ie32cbbe489687a7b50184696a027f87c2e21c409
* | | | | | Merge "Login activity template."Roman Nurik2012-08-0611-0/+490
|\ \ \ \ \ \
| * | | | | | Login activity template.Roman Nurik2012-08-0611-0/+490
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an activity template for Login/Registration. The template sets up a login form that looks good on phones and tablets, and that also accepts registrations using the same form, for an optimized and quick mobile UX. Change-Id: I16f4e7915d88b0b72175fea212faedcd7142ad03
* | | | | | | Merge "Improve Maven defaults in lint"Tor Norbye2012-08-061-12/+38
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Improve Maven defaults in lintTor Norbye2012-08-061-12/+38
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I3c7c13437403fb1392343af079afab9434695566
* | | | | | Merge "35804: When importantForAccessibility="no" is set, don't warn"Tor Norbye2012-08-063-2/+13
|\ \ \ \ \ \