Activity templates cleanup.

This change cleans up the BlankActivity and MasterDetailFlow activity templates
in the following ways:

- Unused search icons are removed.
- Many comments are added for a better explanation of what's going on. See
  http://code.google.com/p/android/issues/detail?id=34463
- Code and comments are in better alignment with Android code style and
  import order (per http://source.android.com/source/code-style.html)
- Non-trivial BlankActivity templates now require API 11 instead of 14.
  More work TBD here.
- Templates are more lint-friendly.
- android:parentActivityName is added when building against API 16.

Change-Id: Iba7b807c7567b161b0e50fb39306209172627c35

1 files changed, 32 insertions, 4 deletions

diff --git a/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl b/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
index 59a90e2..2cc6054 100644
--- a/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
+++ b/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
@@ -6,6 +6,15 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.NavUtils;
 import android.view.MenuItem;
 
+/**
+ * An activity representing a single ${objectKind} detail screen. This
+ * activity is only used on handset devices. On tablet-size devices,
+ * item details are presented side-by-side with a list of items
+ * in a {@link ${CollectionName}Activity}.
+ * <p>
+ * This activity is mostly just a 'shell' activity containing nothing
+ * more than a {@link ${DetailName}Fragment}.
+ */
 public class ${DetailName}Activity extends FragmentActivity {
 
     @Override
@@ -13,9 +22,21 @@ public class ${DetailName}Activity extends FragmentActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_${detail_name});
 
+        // Show the Up button in the action bar.
         getActionBar().setDisplayHomeAsUpEnabled(true);
 
+        // savedInstanceState is non-null when there is fragment state
+        // saved from previous configurations of this activity
+        // (e.g. when rotating the screen from portrait to landscape).
+        // In this case, the fragment will automatically be re-added
+        // to its container so we don't need to manually add it.
+        // For more information, see the Fragments API guide at:
+        //
+        // http://developer.android.com/guide/components/fragments.html
+        //
         if (savedInstanceState == null) {
+            // Create the detail fragment and add it to the activity
+            // using a fragment transaction.
             Bundle arguments = new Bundle();
             arguments.putString(${DetailName}Fragment.ARG_ITEM_ID,
                     getIntent().getStringExtra(${DetailName}Fragment.ARG_ITEM_ID));
@@ -29,11 +50,18 @@ public class ${DetailName}Activity extends FragmentActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            NavUtils.navigateUpTo(this, new Intent(this, ${CollectionName}Activity.class));
-            return true;
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // This ID represents the Home or Up button. In the case of this
+                // activity, the Up button is shown. Use NavUtils to allow users
+                // to navigate up one level in the application structure. For
+                // more details, see the Navigation pattern on Android Design:
+                //
+                // http://developer.android.com/design/patterns/navigation.html#up-vs-back
+                //
+                NavUtils.navigateUpTo(this, new Intent(this, ${CollectionName}Activity.class));
+                return true;
         }
-
         return super.onOptionsItemSelected(item);
     }
 }