diff options
| author | Kenny Root <kenny@the-b.org> | 2015-08-20 13:50:14 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-08-20 14:01:18 -0700 |
| commit | e12eb0fe896f3a4b569a21ccc4ee34fd2a8535cc (patch) | |
| tree | d5244af4e64e6a81bc4b06b63f03a532f5eebfd2 /app/src/main/java/org/connectbot/ConsoleActivity.java | |
| parent | 717ead96315e6a94098c3acc8d57521c646a2cc2 (diff) | |
| parent | 42f6fccc10d10a049ca5604d6645c7cfe9887e18 (diff) | |
| download | connectbot-e12eb0fe896f3a4b569a21ccc4ee34fd2a8535cc.tar.gz connectbot-e12eb0fe896f3a4b569a21ccc4ee34fd2a8535cc.tar.bz2 connectbot-e12eb0fe896f3a4b569a21ccc4ee34fd2a8535cc.zip | |
Merge pull request #140 from jklein24/killactionbarwrapper
Diffstat (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index d6ee629..6f72783 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -30,7 +30,6 @@ import org.connectbot.service.TerminalKeyListener; import org.connectbot.service.TerminalManager; import org.connectbot.util.PreferenceConstants; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.ComponentName; @@ -55,6 +54,8 @@ import android.support.design.widget.TabLayout; import android.support.v4.view.MotionEventCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.ClipboardManager; import android.util.Log; @@ -91,7 +92,7 @@ import android.widget.TextView; import android.widget.Toast; import de.mud.terminal.vt320; -public class ConsoleActivity extends Activity implements BridgeDisconnectedListener { +public class ConsoleActivity extends AppCompatActivity implements BridgeDisconnectedListener { public final static String TAG = "CB.ConsoleActivity"; protected static final int REQUEST_EDIT = 1; @@ -148,7 +149,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe private ImageView mKeyboardButton; - private ActionBarWrapper actionBar; + private ActionBar actionBar; private boolean inActionBarMenu = false; private boolean titleBarHide; @@ -341,7 +342,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe titleBarHide = prefs.getBoolean(PreferenceConstants.TITLEBARHIDE, false); if (titleBarHide) { - getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY); + supportRequestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); } this.setContentView(R.layout.act_console); @@ -451,12 +452,12 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe findViewById(R.id.button_left).setOnClickListener(emulatedKeysListener); findViewById(R.id.button_right).setOnClickListener(emulatedKeysListener); - actionBar = ActionBarWrapper.getActionBar(this); + actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); if (titleBarHide) { actionBar.hide(); } - actionBar.addOnMenuVisibilityListener(new ActionBarWrapper.OnMenuVisibilityListener() { + actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() { public void onMenuVisibilityChanged(boolean isVisible) { inActionBarMenu = isVisible; if (isVisible == false) { |