Merge branch 'master' into bug3832

This commit is contained in:
Steffen Tobias Wagner (D059727) committed 2016-07-28 17:07:35 +01:00
commit 83756fb825
15 files changed
+53 -37

No files matched your search

@@ -4,6 +4,7 @@ import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.View;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.android.tracking.app.ui.fragments.LeaderboardFragment;
@@ -42,6 +43,10 @@ public class LeaderboardWebViewActivity extends BaseActivity {
ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
}
View view = findViewById(R.id.toolbar_subtitle);
if (view != null) {
view.setVisibility(View.GONE);
}
replaceFragment(R.id.content_frame, new LeaderboardFragment());
}