psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw keys: Fix custom app selection dialog

Browse Source 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
xyyx
2019-11-17 05:17:54 +00:00
committed by Hưng Phan
parent f5c8b0b425
commit c58e1987b5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/cherish/settings/preferences/ShortcutPickHelper.java
View File

@@ -22,10 +22,10 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; 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.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@@ -45,7 +45,7 @@ import com.cherish.settings.preferences.ShortcutPickHelper.AppExpandableAdapter.
public class ShortcutPickHelper { public class ShortcutPickHelper {
private Activity mParent; private FragmentActivity mParent;
private AlertDialog mAlertDialog; private AlertDialog mAlertDialog;
private OnPickListener mListener; private OnPickListener mListener;
private PackageManager mPackageManager; private PackageManager mPackageManager;
@@ -58,14 +58,14 @@ public class ShortcutPickHelper {
void shortcutPicked(String uri, String friendlyName, boolean isApplication); void shortcutPicked(String uri, String friendlyName, boolean isApplication);
} }
public ShortcutPickHelper(Activity parent, OnPickListener listener) { public ShortcutPickHelper(FragmentActivity parent, OnPickListener listener) {
mParent = parent; mParent = parent;
mPackageManager = mParent.getPackageManager(); mPackageManager = mParent.getPackageManager();
mListener = listener; mListener = listener;
} }
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == FragmentActivity.RESULT_OK) {
switch (requestCode) { switch (requestCode) {
case REQUEST_PICK_APPLICATION: case REQUEST_PICK_APPLICATION:
completeSetCustomApp(data); completeSetCustomApp(data);
@@ -115,7 +115,7 @@ public class ShortcutPickHelper {
if (lastFragmentId == 0) { if (lastFragmentId == 0) {
mParent.startActivityForResult(pickIntent, requestCode); mParent.startActivityForResult(pickIntent, requestCode);
} else { } else {
Fragment cFrag = mParent.getFragmentManager().findFragmentById(lastFragmentId); Fragment cFrag = mParent.getSupportFragmentManager().findFragmentById(lastFragmentId);
if (cFrag != null) { if (cFrag != null) {
mParent.startActivityFromFragment(cFrag, pickIntent, requestCode); mParent.startActivityFromFragment(cFrag, pickIntent, requestCode);
} }