Commit: 2c2f827da27ee2280730cbc8a2b27593e292f2a5 - external-koush-Superuser (git)

external/koush/Superuser

Commit MetaInfo

• Revision: 2c2f827da27ee2280730cbc8a2b27593e292f2a5 (tree)
• Time: 2019-12-24 01:57:43
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Replace android.support.v4.app by AndroidX

AndroidX is a major improvement to the original Android Support
Library, which is no longer maintained.

Change Summary

• modified: Superuser/src/com/koushikdutta/superuser/LogFragment.java
• modified: Superuser/src/com/koushikdutta/superuser/LogNativeFragment.java
• modified: Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
• modified: Superuser/src/com/koushikdutta/superuser/PolicyFragmentInternal.java
• modified: Superuser/src/com/koushikdutta/superuser/SuCheckerReceiver.java
• modified: Superuser/src/com/koushikdutta/superuser/SuReceiver.java

Incremental Difference

--- a/Superuser/src/com/koushikdutta/superuser/LogFragment.java
+++ b/Superuser/src/com/koushikdutta/superuser/LogFragment.java
@@ -17,7 +17,7 @@
 package com.koushikdutta.superuser;
 
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.koushikdutta.widgets.SupportFragment;
 
@@ -35,8 +35,6 @@ public class LogFragment extends SupportFragment<LogFragmentInternal> {
     }
 
     void onDelete(int id) {
-//        getFragmentManager().beginTransaction().remove(this).commit();
-//        getFragmentManager().popBackStack("content", FragmentManager.POP_BACK_STACK_INCLUSIVE);
         Fragment f = getFragmentManager().findFragmentById(id);
         if (f != null && f instanceof PolicyFragment) {
             PolicyFragment p = (PolicyFragment)f;

--- a/Superuser/src/com/koushikdutta/superuser/LogNativeFragment.java
+++ b/Superuser/src/com/koushikdutta/superuser/LogNativeFragment.java
@@ -17,13 +17,13 @@
 package com.koushikdutta.superuser;
 
 import android.annotation.SuppressLint;
-import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
 
 import com.koushikdutta.widgets.NativeFragment;
 
@@ -59,8 +59,6 @@ public class LogNativeFragment extends NativeFragment<LogFragmentInternal> {
     }
 
     void onDelete(int id) {
-//        getFragmentManager().beginTransaction().remove(this).commit();
-//        getFragmentManager().popBackStack("content", FragmentManager.POP_BACK_STACK_INCLUSIVE);
         Fragment f = getFragmentManager().findFragmentById(id);
         if (f != null && f instanceof PolicyNativeFragment) {
             PolicyNativeFragment p = (PolicyNativeFragment)f;

--- a/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
+++ b/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
@@ -31,7 +31,6 @@ import android.net.LocalSocketAddress;
 import android.net.LocalSocketAddress.Namespace;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -44,6 +43,7 @@ import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.fragment.app.FragmentActivity;
 
 import com.koushikdutta.superuser.db.SuDatabaseHelper;
 import com.koushikdutta.superuser.db.UidPolicy;

--- a/Superuser/src/com/koushikdutta/superuser/PolicyFragmentInternal.java
+++ b/Superuser/src/com/koushikdutta/superuser/PolicyFragmentInternal.java
@@ -32,7 +32,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.app.FragmentActivity;
 import android.text.format.DateFormat;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
@@ -42,6 +41,7 @@ import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.widget.ImageView;
+import androidx.fragment.app.FragmentActivity;
 
 import com.koushikdutta.superuser.db.LogEntry;
 import com.koushikdutta.superuser.db.SuDatabaseHelper;

--- a/Superuser/src/com/koushikdutta/superuser/SuCheckerReceiver.java
+++ b/Superuser/src/com/koushikdutta/superuser/SuCheckerReceiver.java
@@ -6,8 +6,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
-import android.support.v4.app.NotificationCompat;
 import android.util.Log;
+import androidx.core.app.NotificationCompat;
 
 import com.koushikdutta.superuser.util.Settings;
 import com.koushikdutta.superuser.util.SuHelper;

--- a/Superuser/src/com/koushikdutta/superuser/SuReceiver.java
+++ b/Superuser/src/com/koushikdutta/superuser/SuReceiver.java
@@ -21,8 +21,8 @@ import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
 import android.widget.Toast;
+import androidx.core.app.NotificationCompat;
 
 import com.koushikdutta.superuser.db.LogEntry;
 import com.koushikdutta.superuser.db.SuperuserDatabaseHelper;