Merge heads

MyTracks/AndroidManifest.xml

@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   android:installLocation="auto"
-  android:versionCode="54"
+  android:versionCode="55"
   android:versionName="2.0.2"
   package="com.google.android.maps.mytracks" >
 

MyTracks/src/com/google/android/apps/mytracks/AbstractMyTracksActivity.java

@@ -34,10 +34,18 @@ public abstract class AbstractMyTracksActivity extends FragmentActivity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
+
+    // Hide title must be before setContentView
+    if (hideTitle()) {
+      ApiAdapterFactory.getApiAdapter().hideTitle(this);
+    }
+
     setContentView(getLayoutResId());
+
+    // Configure action bar must be after setContentView
     ApiAdapterFactory.getApiAdapter().configureActionBarHomeAsUp(this);
   }
-  
+
   /**
    * Gets the layout resource id.
    */
@@ -52,6 +60,13 @@ public abstract class AbstractMyTracksActivity extends FragmentActivity {
     return true;
   }
 
+  /**
+   * Returns true to hide the title. Be default, do not hide the title.
+   */
+  protected boolean hideTitle() {
+    return false;
+  }
+
   /**
    * Callback when the home menu item is selected.
    */

MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java

@@ -193,7 +193,6 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     handleIntent(getIntent());
-    ApiAdapterFactory.getApiAdapter().hideTitle(this);
 
     SharedPreferences sharedPreferences = getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
@@ -232,6 +231,11 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     return R.layout.track_detail;
   }
 
+  @Override
+  protected boolean hideTitle() {
+    return true;
+  }
+
   @Override
   protected void onStart() {
     super.onStart();