merge heads

This commit is contained in:
Jimmy Shih
2012-05-01 18:01:55 -07:00
parent 07f6cf55b6
commit 52253afd3a
34 changed files with 294 additions and 198 deletions
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks;
import com.google.android.apps.mytracks.fragments.AboutDialogFragment;
import com.google.android.apps.mytracks.util.ApiAdapterFactory;
import com.google.android.apps.mytracks.util.IntentUtils;
import com.google.android.maps.mytracks.R;
import android.content.Intent;
@@ -60,8 +61,8 @@ public class HelpActivity extends FragmentActivity {
if (item.getItemId() != android.R.id.home) {
return false;
}
startActivity(new Intent(this, TrackListActivity.class)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
Intent intent = IntentUtils.newIntent(this, TrackListActivity.class);
startActivity(intent);
return true;
}
}