navigator: Customize representation for non Java modules

The Android view for non-Android modules simply defaulted
to the package view. The idea was that the package view was
written with a similar intention: to place more importance on
the logical view of the project and less importance to the
on-disk structure.

However, it doesn't work really well. Users find it confusing
that tests, sources and resources are all mixed together.

This CL provides some structure to such projects. The info
available for such projects are really just the kind of
source roots that are specified for the module, so the Android
view groups sources by the source root type (java, tests,
resources or test resources).

Fixes https://code.google.com/p/android/issues/detail?id=74732
and possibly https://code.google.com/p/android/issues/detail?id=74057

Change-Id: I380cc2db81521ff8ea71fb2eb5ea4955154dc394

6 files changed, 29 insertions, 1 deletions

diff --git a/android/testData/projects/navigator/packageview/simple/javamodule/build.gradle b/android/testData/projects/navigator/packageview/simple/javamodule/build.gradle
new file mode 100644
index 00000000000..721a6e9a8d9
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/javamodule/build.gradle
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'java'
+
+sourceSets {
+  main {
+    java {
+      srcDir 'src/java'
+    }
+    resources {
+      srcDir 'src/resources'
+    }
+  }
+}
diff --git a/android/testData/projects/navigator/packageview/simple/javamodule/src/java/com/foo/Foo.java b/android/testData/projects/navigator/packageview/simple/javamodule/src/java/com/foo/Foo.java
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/javamodule/src/java/com/foo/Foo.java
diff --git a/android/testData/projects/navigator/packageview/simple/javamodule/src/resources/res2.txt b/android/testData/projects/navigator/packageview/simple/javamodule/src/resources/res2.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/javamodule/src/resources/res2.txt
diff --git a/android/testData/projects/navigator/packageview/simple/javamodule/src/test/java/com/foo/FooTest.java b/android/testData/projects/navigator/packageview/simple/javamodule/src/test/java/com/foo/FooTest.java
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/javamodule/src/test/java/com/foo/FooTest.java
diff --git a/android/testData/projects/navigator/packageview/simple/javamodule/src/test/resources/test-res.txt b/android/testData/projects/navigator/packageview/simple/javamodule/src/test/resources/test-res.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/javamodule/src/test/resources/test-res.txt
diff --git a/android/testData/projects/navigator/packageview/simple/settings.gradle b/android/testData/projects/navigator/packageview/simple/settings.gradle
index 3cbe2493511..839594db87b 100644
--- a/android/testData/projects/navigator/packageview/simple/settings.gradle
+++ b/android/testData/projects/navigator/packageview/simple/settings.gradle
@@ -1 +1 @@
-include ':app', ':lib'
+include ':app', ':lib', ':javamodule'