Skip to content

Commit

Permalink
Change actionbar to support actionbar
Browse files Browse the repository at this point in the history
  • Loading branch information
markwinter committed Mar 30, 2014
1 parent e24eab9 commit 9c2e550
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions app/src/main/java/im/tox/antox/activities/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package im.tox.antox.activities;

import android.app.ActionBar;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
Expand All @@ -21,7 +20,7 @@
import android.support.v4.widget.SlidingPaneLayout;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.SearchView;
import android.text.TextUtils;
import android.support.v7.app.ActionBar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -45,8 +44,6 @@
import java.net.Socket;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;

import im.tox.antox.data.AntoxDB;
Expand Down Expand Up @@ -74,7 +71,7 @@
* @author Mark Winter (Astonex)
*/

public class MainActivity extends ActionBarActivity {
public class MainActivity extends ActionBarActivity{

private static final String TAG = "im.tox.antox.activities.MainActivity";

Expand Down Expand Up @@ -270,7 +267,7 @@ public boolean onNavigationItemSelected(int i, long l) {
return true;
}
};
ActionBar actions = getActionBar();
ActionBar actions = getSupportActionBar();
actions.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
actions.setDisplayShowTitleEnabled(false);
actions.setListNavigationCallbacks(adapter, callback);
Expand Down

0 comments on commit 9c2e550

Please sign in to comment.