Merge pull request #215 from khorimoto/fix-build

Use AppCompatActivity instead of Activity.

2 files changed, 4 insertions, 28 deletions

diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index d3187af..38afb62 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -17,11 +17,11 @@
 
 package org.connectbot;
 
-import android.app.Activity;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
@@ -68,7 +68,7 @@ import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-public class HostListActivity extends Activity implements OnHostStatusChangedListener {
+public class HostListActivity extends AppCompatActivity implements OnHostStatusChangedListener {
 	public final static String TAG = "CB.HostListActivity";
 	public static final String DISCONNECT_ACTION = "org.connectbot.action.DISCONNECT";
 
@@ -251,7 +251,8 @@ public class HostListActivity extends Activity implements OnHostStatusChangedLis
 				quickconnect.setError(null);
 				quickconnect.requestFocus();
 			}
-			public void onNothingSelected(AdapterView<?> arg0) { }
+
+			public void onNothingSelected(AdapterView<?> arg0) {}
 		});
 		transportSpinner.setAdapter(transportSelection);
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 5129767..0000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ ConnectBot: simple, powerful, open-source SSH client for Android
-  ~ Copyright 2015 Kenny Root, Jeffrey Sharkey
-  ~
-  ~ 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.
-  -->
-
-<resources>
-	<style name="AppTheme" parent="android:Theme.Material">
-		<item name="android:colorPrimary">@color/primary</item>
-		<item name="android:colorPrimaryDark">@color/dark_primary</item>
-		<item name="android:colorAccent">@color/accent</item>
-	</style>
-</resources>
\ No newline at end of file