navigator: show android pane before scope pane

Fixes https://code.google.com/p/android/issues/detail?id=74678

Change-Id: I2fda607414e742690ddd9afd41408d19858b69d3
Merge "navigator: show android pane before scope pane" into idea133
Snapshot idea/135.1272 from git://git.jetbrains.org/idea/community.git

f07050c: fix
918343d: remove hacks and introduce RightAligned toolbar actions (cherry picked from commit 9c7c637)
ccbe75a: make WeakStringInterner concurrent (cherry picked from commit 5414347785ae0827bdad488c823eff81a2c5148e)
95e7e88: don't hold all strings from all plugin.xmls forever
6c61e8a: fix compile
8001655: simplify matched condition (IDEA-128096) (cherry picked from commit 0b93c03) [r=Maxim.Mossienko]
f89e244: IDEA-128342 Tip of the Day window does not retain size (cherry picked from commit de86410) [r=Konstantin.Bulenkov]
1cc5555: [performance fix] check containing method to have at least the same name as method usage we encountered, to avoid resolving during hierarchy visiting for detecting delegation (IDEA-128264) (cherry picked from commit bf1f259)
5d2dcec: Problem with Turkish "I" character when searching case-insensitive (IDEA-70993) (cherry picked from commit a07da60) [r=Alexey.Kudryavtsev]
d687cb2: IDEA-127582 [Gradle] Web Resource Directory will be set to empty
f2b616f: Merge remote branch 'origin/135' into 135
2a76996: using the right api call to register compiled class (IDEA-128051 Groovy aspectj compilation)
8499fd0: fix compilation
68afac1: ModuleWithDependentsScope: walk dependency graph more carefully with respect to exported dependencies (cherry picked from commit 9400b89)
8dda1c1: remove too large file from files scheduled for update in after event: large file might be scheduled for update in before event when its size was not so large (cherry picked from commit 281bc7a) [r=Eugene.Zhuravlev]
6e1e000: touch file to recompile (cherry picked from commit 5972053)
f8ae2bf: attempt to fix IDEA-123132 Error: failed to create a child event loop
c51a768: we must avoid use UUID.randomUUID — can cause long network calls (cherry picked from commit 421efd0)
9158cb3: https://groups.google.com/forum/#!searchin/netty/netty$204.1/netty/8jf6SPFiN6g/nLg7opwUsxwJ
2626374: update grails project structure: remove proper instance of ContentEntry (IDEA-120622) using urls since ContentEntry uses default equals/hashcode implementation [rev by Peter]
06d32e7: Merge remote-tracking branch 'origin/135' into 135
fe96457: don't print exceptions
a8ec2a3: IDEA-127693 Grails create-app is not executed
8e6860e: CommentInjector: improved detection and IDEA-114915 InjectorUtils performance (cherry picked from commit 70c5d69a7c7ff80abefba629deaf26b1389f7dac)
cfc4df7: memory hogging on javaInjections.xml editing (cherry picked from commit dd23104)
5cb5ccb: IDEA-125414 DB keys/indices to columns navigation (cherry picked from commit e9e95238a6bf2164e50214193e4112e3b83c544b)
cb4c367: fix not-disposed errors on quit (cherry picked from commit 36db24a729cf5b0272cf34344ed97197dd2ac686)
435b39c: EA-57466 - ISE: Messages.getErrorIcon (cherry picked from commit c0ff0b1376a3e6f9a571f827661705344b7d04db)
20e9aa3: EA-56674 - IAE: DbFindUsagesHandlerFactory.canFindUsages (cherry picked from commit 6ef97d67eff5d6ebdf8a90ff6badd3afb77e873f)
903505c: larger code cache size + flag to enable code cache size flushing
12f4b29: IDEA-122701 IDEA doesn't start on Mac under one of the user accounts after patch update
25b3d2c: fix compilation against api of updated ecj compiler
8a4fe4f: on case-insensitive file systems perform file name compatibility check using real file names, not the ones taken from dynamically built or stored paths
4cd11a5: bundling ecj-4.4 java compiler
66ef9e0: skip non-java files with given word in literal even before retrieving text / searching the word / finding element at tree (IDEA-126201) (cherry picked from commit 067aa19)
d991868: catch exception when writing content, marking vfs for rebuild (IDEA-125925) (cherry picked from commit 68c651e)
a9946ef: 13.1.5, if we will need
bce54d1: java: parser changes temporarily reverted
6d8a2b1: IDEA-127077 (incorrect parsing of type annotations)
c6d2f90: Cleanup (warning)

Change-Id: I19ca71bea0105be0698b9a8e401260e488809d56
Merge remote-tracking branch 'aosp/upstream-133' into merge

Conflicts:
	build/scripts/tests.gant

Change-Id: I951abe701c24ce8e6fd07d9d502f69eaaae95b72
Merge "Merge remote-tracking branch 'aosp/upstream-133' into merge" into idea133
Remove defunct library gradle-import

Change-Id: Ice92249f71d1ca204883632355a40af06bb0f183
Merge "Remove defunct library gradle-import" into idea133
74020: Cannot edit file which dragged from outside

Backport the dialog from IJ14 where on write access
files that are not in a project result in a popup where the
user has to explicitly unlock the files.

This incorporates code from 6c0132db48220510441dbbfd8cd026fb21d00a2e
and 590f15387dd3e0b3e969f5498d41e265c6776b42 and a few others (but
is not a plain cherry pick since there were a number of changes in
particularly the AccessProvider class which depend on many other
IJ14 changes.)

Change-Id: If28ea4c1a85888b3297ac0b060aca1975698b7b1
Merge "74020: Cannot edit file which dragged from outside" into idea133
73999: Corrupt installation: Still contains android-designer bits

Change-Id: I33ce74f7b61423f0c7e63db1d5ebad01c8ffc2ff
Merge "73999: Corrupt installation: Still contains android-designer bits" into idea133
Add script for running UI tests from the command line

Usage:
$ cd tools/idea
$ ant guiTests

Test results are written to build/TEST-*

Change-Id: I5e395e4348eb70ef65ae819277555ee95642bdfb
Merge "Add script for running UI tests from the command line" into idea133
75780: Android Studio: remove J2ME from Project Default code inspection profile

Move the SimplifiableIf inspection over to the code style category.

Change-Id: I67a1744dfb22afb0d5bc0874cdacb4cbfc93721e
Merge "75780: Android Studio: remove J2ME from Project Default code inspection profile" into idea133
Remove run configurations that we're not using in Android Studio

Cleans up the Run... dialog.

Change-Id: Id3720b942230a030e72197bb50c464b69c0ec0c9
Don't run inspections in extracted AAR folders

Most "outputs" (such as build/intermediates/) are marked as generated
source roots, which means IntelliJ won't scan those folders for
warnings.

However, AAR libraries are extracted into special build folders
(currently build/intermediates/exploded-aar) which are *not* marked as
generated; that's necessary such that those folders are scanned (for
indexing purposes), handled as potential go-to-declaration targets
(since resource files there can contain for example themes extended in
the user's application). Therefore, by default, IntelliJ will analyze
all the files in the exploded AAR folders. When you have large
libraries like appcompat or play services, this not only takes a lot
of extra time to analyze. You also end up with a lot of errors in
files you can't edit. For example, with appcompat, you end up with
over 700 spelling mistake warnings, and with play services, you end up
with over a hundred unused namespace warnings, and over a hundred tag
has no children warnings!

Therefore, this CL tweaks the batch analysis runner which iterates
over PSI files to skip files that are found to be within an AAR
folder. This removes all the false positives and speeds up code
analysis quite significantly!

Change-Id: I3dfdd663689a9d75de0318b03e5c4d8c3c6c30f6
Merge "Remove run configurations that we're not using in Android Studio" into idea133
Don't suggest making activities/fragments private

If you run Analyze > Inspect Code... on a default Android project,
you'll end up with suggestions that you should make your various
activities and services package protected (since they may not be
referenced from other code in the project). However, you can't do that
- at runtime the various inflaters will throw exceptions if you do.

This CL adds knowledge to the class analyzer in IntelliJ such that
it's aware of the Android context classes and does not suggest
reducing visibility of these.

Change-Id: Ib5e7004dba8b66b6541be87f121195453568822a
Merge "Don't run inspections in extracted AAR folders" into idea133