aboutsummaryrefslogtreecommitdiffstats
path: root/templates/activities/MasterDetailFlow
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-06-18 11:45:52 -0700
committerTor Norbye <tnorbye@google.com>2012-06-18 12:28:09 -0700
commit8624e045922e68ccca262a25e44ad979447c17a9 (patch)
treef98ab2310b0b13323b3e613f06271f5258b177b2 /templates/activities/MasterDetailFlow
parent480e305192e65f5e69687bbc6dafbebfa9e1edbc (diff)
downloadsdk-8624e045922e68ccca262a25e44ad979447c17a9.zip
sdk-8624e045922e68ccca262a25e44ad979447c17a9.tar.gz
sdk-8624e045922e68ccca262a25e44ad979447c17a9.tar.bz2
Rename template file from _ prefix
One of the template files ended up not getting packaged, probably because it started with a "_". Also, add @Override to some methods overriding a superclass method (onCreate(Bundle)) and fix an NPE. Change-Id: Ic2f15d968cca156704146bdc4ec501d1359a7620
Diffstat (limited to 'templates/activities/MasterDetailFlow')
-rw-r--r--templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl1
1 files changed, 1 insertions, 0 deletions
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});