package org.mozilla.focus.activity;

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;

import org.mozilla.focus.R;

public class SettingsActivity extends AppCompatActivity {
    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_settings);

        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    }
}

@@ -34,39 +34,8 @@
 y;%0A%0A
-import android.content.Intent;%0A
 impo
@@ -52,24 +52,24 @@
 .os.Bundle;%0A
+
 import andro
@@ -96,24 +96,65 @@
 n.Nullable;%0A
+import android.support.v7.app.ActionBar;%0A
 import andro
@@ -256,42 +256,12 @@
 iew.
-Menu;%0Aimport android.view.MenuItem
+View
 ;%0A%0Ai
@@ -640,60 +640,333 @@
     
-getSupportActionBar().setDisplayHomeAsUpEnabled(true
+final ActionBar actionBar = getSupportActionBar();%0A        assert actionBar != null;%0A%0A        actionBar.setDisplayHomeAsUpEnabled(true);%0A%0A        toolbar.setNavigationOnClickListener(new View.OnClickListener() %7B%0A            @Override%0A            public void onClick(View v) %7B%0A                finish();%0A            %7D%0A        %7D
 );%0A 

Implement up button listener. (#208)