Merge "Rename template file from _ prefix"

7 files changed, 10 insertions, 5 deletions

diff --git a/ide_common/src/com/android/ide/common/resources/ResourceFolder.java b/ide_common/src/com/android/ide/common/resources/ResourceFolder.java
index d0d91c7..d6464c8 100644
--- a/ide_common/src/com/android/ide/common/resources/ResourceFolder.java
+++ b/ide_common/src/com/android/ide/common/resources/ResourceFolder.java
@@ -251,7 +251,7 @@ public final class ResourceFolder implements Configurable {
      * @param name the name of the file.
      */
     public boolean hasFile(String name) {
-        if (mNames.containsKey(name)) {
+        if (mNames != null && mNames.containsKey(name)) {
             return true;
         }
 
diff --git a/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl b/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl
index cb2d894..a7bbff0 100644
--- a/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl
+++ b/templates/activities/BlankActivity/root/src/app_package/DropdownActivity.java.ftl
@@ -21,6 +21,7 @@ public class ${activityClass} extends FragmentActivity implements ActionBar.OnNa
 
     private static final String STATE_SELECTED_NAVIGATION_ITEM = "selected_navigation_item";
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.${layoutName});
@@ -67,7 +68,7 @@ public class ${activityClass} extends FragmentActivity implements ActionBar.OnNa
         getMenuInflater().inflate(R.menu.${menuName}, menu);
         return true;
     }
-    <#include "_onOptionsItemSelected.java.ftl">
+    <#include "include_onOptionsItemSelected.java.ftl">
 
     @Override
     public boolean onNavigationItemSelected(int position, long id) {
diff --git a/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl b/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
index eb46d9c..70cc3f7 100644
--- a/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
+++ b/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
@@ -8,6 +8,7 @@ import android.support.v4.app.NavUtils;
 
 public class ${activityClass} extends Activity {
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.${layoutName});
@@ -21,5 +22,5 @@ public class ${activityClass} extends Activity {
         getMenuInflater().inflate(R.menu.${menuName}, menu);
         return true;
     }
-    <#include "_onOptionsItemSelected.java.ftl">
+    <#include "include_onOptionsItemSelected.java.ftl">
 }
diff --git a/templates/activities/BlankActivity/root/src/app_package/TabsActivity.java.ftl b/templates/activities/BlankActivity/root/src/app_package/TabsActivity.java.ftl
index 0811492..ba5c26c 100644
--- a/templates/activities/BlankActivity/root/src/app_package/TabsActivity.java.ftl
+++ b/templates/activities/BlankActivity/root/src/app_package/TabsActivity.java.ftl
@@ -20,6 +20,7 @@ public class ${activityClass} extends FragmentActivity implements ActionBar.TabL
 
     private static final String STATE_SELECTED_NAVIGATION_ITEM = "selected_navigation_item";
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.${layoutName});
@@ -56,7 +57,7 @@ public class ${activityClass} extends FragmentActivity implements ActionBar.TabL
         getMenuInflater().inflate(R.menu.${menuName}, menu);
         return true;
     }
-    <#include "_onOptionsItemSelected.java.ftl">
+    <#include "include_onOptionsItemSelected.java.ftl">
 
     @Override
     public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
diff --git a/templates/activities/BlankActivity/root/src/app_package/TabsAndPagerActivity.java.ftl b/templates/activities/BlankActivity/root/src/app_package/TabsAndPagerActivity.java.ftl
index 850483f..58f6452 100644
--- a/templates/activities/BlankActivity/root/src/app_package/TabsAndPagerActivity.java.ftl
+++ b/templates/activities/BlankActivity/root/src/app_package/TabsAndPagerActivity.java.ftl
@@ -33,6 +33,7 @@ public class ${activityClass} extends FragmentActivity<#if navType?contains("tab
      */
     ViewPager mViewPager;
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.${layoutName});
@@ -82,7 +83,7 @@ public class ${activityClass} extends FragmentActivity<#if navType?contains("tab
         getMenuInflater().inflate(R.menu.${menuName}, menu);
         return true;
     }
-    <#include "_onOptionsItemSelected.java.ftl">
+    <#include "include_onOptionsItemSelected.java.ftl">
 
     <#if navType?contains("tabs")>
     @Override
diff --git a/templates/activities/BlankActivity/root/src/app_package/_onOptionsItemSelected.java.ftl b/templates/activities/BlankActivity/root/src/app_package/include_onOptionsItemSelected.java.ftl
index c77fdee..c77fdee 100644
--- a/templates/activities/BlankActivity/root/src/app_package/_onOptionsItemSelected.java.ftl
+++ b/templates/activities/BlankActivity/root/src/app_package/include_onOptionsItemSelected.java.ftl
diff --git a/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl b/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
index d75c5c3..9edf5c8 100644
--- a/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
+++ b/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
@@ -11,6 +11,7 @@ public class ${CollectionName}Activity extends FragmentActivity
 
     private boolean mTwoPane;
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_${collection_name});