From c58e1987b5f209b40223998eec7d0e078c3ce95b Mon Sep 17 00:00:00 2001 From: xyyx Date: Sun, 17 Nov 2019 05:17:54 +0000 Subject: [PATCH] hw keys: Fix custom app selection dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hưng Phan --- .../settings/preferences/ShortcutPickHelper.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/cherish/settings/preferences/ShortcutPickHelper.java b/src/com/cherish/settings/preferences/ShortcutPickHelper.java index 67c93a2..44eaf3e 100644 --- a/src/com/cherish/settings/preferences/ShortcutPickHelper.java +++ b/src/com/cherish/settings/preferences/ShortcutPickHelper.java @@ -22,10 +22,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; -import android.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -45,7 +45,7 @@ import com.cherish.settings.preferences.ShortcutPickHelper.AppExpandableAdapter. public class ShortcutPickHelper { - private Activity mParent; + private FragmentActivity mParent; private AlertDialog mAlertDialog; private OnPickListener mListener; private PackageManager mPackageManager; @@ -58,14 +58,14 @@ public class ShortcutPickHelper { void shortcutPicked(String uri, String friendlyName, boolean isApplication); } - public ShortcutPickHelper(Activity parent, OnPickListener listener) { + public ShortcutPickHelper(FragmentActivity parent, OnPickListener listener) { mParent = parent; mPackageManager = mParent.getPackageManager(); mListener = listener; } public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode == Activity.RESULT_OK) { + if (resultCode == FragmentActivity.RESULT_OK) { switch (requestCode) { case REQUEST_PICK_APPLICATION: completeSetCustomApp(data); @@ -115,7 +115,7 @@ public class ShortcutPickHelper { if (lastFragmentId == 0) { mParent.startActivityForResult(pickIntent, requestCode); } else { - Fragment cFrag = mParent.getFragmentManager().findFragmentById(lastFragmentId); + Fragment cFrag = mParent.getSupportFragmentManager().findFragmentById(lastFragmentId); if (cFrag != null) { mParent.startActivityFromFragment(cFrag, pickIntent, requestCode); }