Changed Import & Export Activities to extend AppCompatActivity

Author: staber

src/com/github/andlyticsproject/ExportActivity.java

@@ -1,6 +1,6 @@
 package com.github.andlyticsproject;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -16,7 +16,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.BaseAdapter;
@@ -38,7 +37,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ExportActivity extends Activity {
+public class ExportActivity extends AppCompatActivity {
 
 	private static final String TAG = ExportActivity.class.getSimpleName();
 
@@ -67,15 +66,14 @@ public class ExportActivity extends Activity {
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
 
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
 		setContentView(R.layout.export_stats);
 		setProgressBarIndeterminateVisibility(false);
 
 		layoutInflater = getLayoutInflater();
 
 		accountName = getIntent().getExtras().getString(EXTRA_ACCOUNT_NAME);
-		getActionBar().setSubtitle(accountName);
+		getSupportActionBar().setSubtitle(accountName);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 		adapter = new ExportListAdapter();
 		setAppInfos(appInfos);
@@ -157,7 +155,7 @@ protected void onSaveInstanceState(Bundle state) {
 
 
 	@Override
-	public Object onRetainNonConfigurationInstance() {
+	public Object onRetainCustomNonConfigurationInstance() {
 		return loadTask == null ? null : loadTask.detach();
 	}
 

src/com/github/andlyticsproject/ImportActivity.java

@@ -1,6 +1,6 @@
 package com.github.andlyticsproject;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -12,7 +12,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ListView;
@@ -33,7 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ImportActivity extends Activity {
+public class ImportActivity extends AppCompatActivity {
 
 	private static final String TAG = ImportActivity.class.getSimpleName();
 
@@ -58,15 +57,13 @@ public class ImportActivity extends Activity {
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
 
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
 		setContentView(R.layout.import_stats);
 		setProgressBarIndeterminateVisibility(false);
 
 		layoutInflater = getLayoutInflater();
 
 		accountName = getAccountName();
-		getActionBar().setSubtitle(accountName);
+		getSupportActionBar().setSubtitle(accountName);
 
 		if (state != null) {
 			importFilenames = (ArrayList<String>) state.getSerializable(EXTRA_IMPORT_FILENAMES);
@@ -103,7 +100,7 @@ protected void onSaveInstanceState(Bundle state) {
 	}
 
 	@Override
-	public Object onRetainNonConfigurationInstance() {
+	public Object onRetainCustomNonConfigurationInstance() {
 		return loadTask == null ? null : loadTask.detach();
 	}