From 67cc377d588c7a3f393a4ede097149f8ad4c0e63 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 29 Oct 2019 20:47:23 +0100
Subject: [PATCH] Cherish: slimRecents: Changes for android 10

Change-Id: I6b1adf3e0b6bbfe3e3b36dff9e99d0d5439b5e1e
Signed-off-by: rohan <purohit.rohan@gmail.com>
---
 res/values/cherish_strings.xml                     |  1 -
 .../preferences/SlimShortcutPickerHelper.java      | 14 +++++++++-----
 .../preferences/dslv/ActionListViewSettings.java   | 14 ++++++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index b70ceee..81211df 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -333,7 +333,6 @@
     <string name="fod_recognizing_animation_summary">Show an animation while reading your fingerprint</string>
 
     <!-- Slim recents -->
-    <string name="ok">OK</string>
     <string name="alternative_recents_category">Alternative recents</string>
     <string name="alternative_recents_swipe_up_enabled_warning_summary">When using swipe up home navigation to open recents, only stock recents are supported</string>
     <string name="slim_recents_title">Slim Recents</string>
diff --git a/src/com/cherish/settings/preferences/SlimShortcutPickerHelper.java b/src/com/cherish/settings/preferences/SlimShortcutPickerHelper.java
index e0b96fd..88a139a 100644
--- a/src/com/cherish/settings/preferences/SlimShortcutPickerHelper.java
+++ b/src/com/cherish/settings/preferences/SlimShortcutPickerHelper.java
@@ -17,7 +17,6 @@
 package com.cherish.settings.preferences;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
 import android.content.pm.PackageManager;
@@ -32,6 +31,9 @@ import com.android.settings.R;
 
 import com.android.internal.util.slim.AppHelper;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 import java.util.ArrayList;
 
 public class SlimShortcutPickerHelper {
@@ -107,13 +109,15 @@ public class SlimShortcutPickerHelper {
     }
 
     private void startFragmentOrActivity(Intent pickIntent, int requestCode) {
-        if (lastFragmentId == 0) {
+        if (lastFragmentId == 0 || !(mParent instanceof FragmentActivity)) {
             mParent.startActivityForResult(pickIntent, requestCode);
         } else {
-            Fragment cFrag = mParent.getFragmentManager().findFragmentById(lastFragmentId);
+            final FragmentActivity fa = (FragmentActivity) mParent;
+            Fragment cFrag = fa.getSupportFragmentManager().findFragmentById(lastFragmentId);
             if (cFrag != null) {
-                mParent.startActivityFromFragment(cFrag, pickIntent, requestCode);
-            }
+                fa.startActivityFromFragment(cFrag, pickIntent, requestCode);
+            } else {
+                mParent.startActivityForResult(pickIntent, requestCode);            }
         }
     }
 
diff --git a/src/com/cherish/settings/preferences/dslv/ActionListViewSettings.java b/src/com/cherish/settings/preferences/dslv/ActionListViewSettings.java
index 124071f..e365c2b 100644
--- a/src/com/cherish/settings/preferences/dslv/ActionListViewSettings.java
+++ b/src/com/cherish/settings/preferences/dslv/ActionListViewSettings.java
@@ -19,11 +19,7 @@ package com.cherish.settings.preferences.dslv;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.DialogInterface;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.ListFragment;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -51,6 +47,7 @@ import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -61,6 +58,14 @@ import com.android.internal.util.slim.ImageHelper;
 import com.android.internal.util.slim.DeviceUtils;
 import com.android.internal.util.slim.DeviceUtils.FilteredDeviceFeaturesArray;
 
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.ListFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.cherish.settings.preferences.SlimShortcutPickerHelper;
 
@@ -194,6 +199,7 @@ public class ActionListViewSettings extends ListFragment implements
         mUseAppPickerOnly = getArguments().getBoolean("useAppPickerOnly", false);
         mUseFullAppsOnly = getArguments().getBoolean("useOnlyFullAppPicker", false);
         mDisableIconPicker = getArguments().getBoolean("disableIconPicker", false);
+        mDisableIconPicker = true;
         mDisableDeleteLastEntry = getArguments().getBoolean("disableDeleteLastEntry", false);
 
         mDisableMessage = (TextView) view.findViewById(R.id.disable_message);