navigator: package view fixes

This CL fixes a bunch of issues in the package view for
Gradle based Android projects. See
https://code.google.com/p/android/issues/detail?id=68832
for a list of issues.

In particular, in the packages view, the node representing
a module is replaced with a new node, called the AndroidModuleNode.
This node simply overrides the existing package view node for a
module to add some categorization for different source types (the
existing view does not distinguish between java or res, it treats
everything under a source root as a java package).

Manifest files weren't displayed in the package view earlier since
they were outside a source root, but they are displayed now.

Just like the existing package view, the update view also does
not display files that are not in an active source root i.e. files
not enabled for the current variant aren't displayed.

Change-Id: I47d21b5776f40f874b958b99d39c97147e29918a

18 files changed, 199 insertions, 0 deletions

diff --git a/android/testData/projects/navigator/packageview/simple/app/.gitignore b/android/testData/projects/navigator/packageview/simple/app/.gitignore
new file mode 100644
index 00000000000..796b96d1c40
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/testData/projects/navigator/packageview/simple/app/build.gradle b/android/testData/projects/navigator/packageview/simple/app/build.gradle
new file mode 100644
index 00000000000..38700df2104
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion '19.0.3'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 19
+        versionCode 10
+        versionName "1.0"
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:+'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
\ No newline at end of file
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/debug/AndroidManifest.xml b/android/testData/projects/navigator/packageview/simple/app/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000000..c8c329a89ad
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.canon.app" >
+
+</manifest>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/AndroidManifest.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..0af21be139a
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.canon.app" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.canon.app.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/java/com/example/canon/app/MainActivity.java b/android/testData/projects/navigator/packageview/simple/app/src/main/java/com/example/canon/app/MainActivity.java
new file mode 100644
index 00000000000..bb531ccf315
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/java/com/example/canon/app/MainActivity.java
@@ -0,0 +1,36 @@
+package com.example.canon.app;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class MainActivity extends ActionBarActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+}
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/drawable-mdpi/ic_launcher.png b/android/testData/projects/navigator/packageview/simple/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000000..359047dfa4e
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/layout/activity_main.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000000..03ce964b15b
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,17 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.example.canon.app.MainActivity">
+
+    <TextView
+        android:id="@+id/text"
+        android:text="@string/hello_world"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/menu/main.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/res/menu/main.xml
new file mode 100644
index 00000000000..f756cffb0ba
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/menu/main.xml
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.example.canon.app.MainActivity" >
+    
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/values-w820dp/dimens.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000000..63fc8164446
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/dimens.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000000..e62d6c63bba
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <!--<dimen name="activity_horizontal_margin">16dp</dimen>-->
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/strings.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..a2583a82341
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">canon</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+
+</resources>
diff --git a/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/styles.xml b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..766ab993048
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/app/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>
diff --git a/android/testData/projects/navigator/packageview/simple/build.gradle b/android/testData/projects/navigator/packageview/simple/build.gradle
new file mode 100644
index 00000000000..8b4789bd2ca
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/build.gradle
@@ -0,0 +1,16 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.10.0'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
diff --git a/android/testData/projects/navigator/packageview/simple/lib/build.gradle b/android/testData/projects/navigator/packageview/simple/lib/build.gradle
new file mode 100644
index 00000000000..25bb26d1431
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/lib/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 18
+    buildToolsVersion "19.0.3"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 16
+        versionCode 1
+        versionName "1.0"
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:19.+'
+}
diff --git a/android/testData/projects/navigator/packageview/simple/lib/src/main/AndroidManifest.xml b/android/testData/projects/navigator/packageview/simple/lib/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..a2f1fc50d24
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/lib/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.lib2.lib">
+
+    <application android:allowBackup="true"
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+>
+
+    </application>
+
+</manifest>
diff --git a/android/testData/projects/navigator/packageview/simple/lib/src/main/res/drawable-mdpi/ic_launcher.png b/android/testData/projects/navigator/packageview/simple/lib/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000000..359047dfa4e
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/lib/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/android/testData/projects/navigator/packageview/simple/lib/src/main/res/values/strings.xml b/android/testData/projects/navigator/packageview/simple/lib/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..68e6659bee1
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/lib/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">lib2</string>
+</resources>
diff --git a/android/testData/projects/navigator/packageview/simple/settings.gradle b/android/testData/projects/navigator/packageview/simple/settings.gradle
new file mode 100644
index 00000000000..3cbe2493511
--- /dev/null
+++ b/android/testData/projects/navigator/packageview/simple/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':lib'