/*
 * Copyright (c) 2015 Justin White <jw@justinwhite.net>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 * 1. Redistributions of source code must retain the above copyright notice,
 * this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 *
 * 3. Neither the name of the copyright holder nor the names of its
 * contributors may be used to endorse or promote products derived from this
 * software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 */

package net.justinwhite.score_it;

import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import net.justinwhite.score_it.phase_10.CreatePhase10GameActivity;

import butterknife.ButterKnife;
import butterknife.OnClick;

public class MainActivity
        extends AppCompatActivity
{

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
        ButterKnife.bind(this);
    }

    @SuppressWarnings("unused")
    @OnClick(R.id.buttonSelectGame)
    protected void StartNewGame() {
        Intent intent = new Intent(this, CreatePhase10GameActivity.class);
        startActivity(intent);
    }
}

@@ -1709,32 +1709,115 @@
 v7.app.A
-ppCompatActivity
+ctionBar;%0Aimport android.support.v7.app.AppCompatActivity;%0Aimport android.support.v7.widget.Toolbar
 ;%0A%0Aimpor
@@ -1880,16 +1880,41 @@
 ivity;%0A%0A
+import butterknife.Bind;%0A
 import b
@@ -2029,16 +2029,62 @@
 vity%0A%7B%0A%0A
+    @Bind(R.id.toolbar)%0A    Toolbar toolbar;%0A%0A
     @Ove
@@ -2238,16 +2238,16 @@
 _main);%0A
-
         
@@ -2266,24 +2266,269 @@
 bind(this);%0A
+        // setup the fancy new material style toolbar%0A        setSupportActionBar(toolbar);%0A        ActionBar actionbar = getSupportActionBar();%0A        if (actionbar != null) %7B%0A            actionbar.setDisplayHomeAsUpEnabled(false);%0A        %7D%0A%0A
     %7D%0A%0A    @

Make toolbar match in MainActivity