/*
 * Copyright 2013-2015 The GDG Frisbee Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.gdg.frisbee.android.activity;

import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;

import org.gdg.frisbee.android.R;
import org.gdg.frisbee.android.api.model.Chapter;
import org.gdg.frisbee.android.appwidget.UpcomingEventWidgetProvider;
import org.gdg.frisbee.android.chapter.ChapterSelectDialog;
import org.gdg.frisbee.android.common.GdgActivity;
import org.gdg.frisbee.android.fragment.SettingsFragment;
import org.gdg.frisbee.android.utils.PrefUtils;

public class SettingsActivity extends GdgActivity implements ChapterSelectDialog.Listener {

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_settings);
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);

        if (savedInstanceState == null) {
            getFragmentManager().beginTransaction()
                .add(R.id.settings_fragment, new SettingsFragment())
                .commit();
        }
    }

    @Override
    protected String getTrackedViewName() {
        return "/Settings";
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == android.R.id.home) {
            finish();
            return true;
        }
        return super.onOptionsItemSelected(item);
    }

    @Override
    public void onChapterSelected(Chapter selectedChapter) {
        PrefUtils.setHomeChapter(this, selectedChapter);
        // Update widgets to show newest chosen GdgHome events
        startService(new Intent(this, UpcomingEventWidgetProvider.UpdateService.class));
    }
}

@@ -703,16 +703,58 @@
 Bundle;%0A
+import android.support.v7.widget.Toolbar;%0A
 import a
@@ -775,16 +775,16 @@
 nuItem;%0A
-
 %0Aimport 
@@ -1028,19 +1028,25 @@
 .common.
-Gdg
+Trackable
 Activity
@@ -1192,19 +1192,25 @@
 extends 
-Gdg
+Trackable
 Activity
@@ -1365,16 +1365,16 @@
 State);%0A
-
         
@@ -1417,16 +1417,128 @@
 tings);%0A
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_actionbar);%0A        setSupportActionBar(toolbar);%0A
         

Remove GdgActivity dependency from Settings. Hopefully this will fix the crash.