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

Cherish: slimRecents: Changes for android 10

Browse Source 
Change-Id: I6b1adf3e0b6bbfe3e3b36dff9e99d0d5439b5e1e
Signed-off-by: rohan <purohit.rohan@gmail.com>
This commit is contained in:
SpiritCroc
2019-10-29 20:47:23 +01:00
committed by Hung Phan
parent a8ff719262
commit 67cc377d58
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/cherish_strings.xml
View File

@@ -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>

14
src/com/cherish/settings/preferences/SlimShortcutPickerHelper.java
View File

@@ -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); }
}
}

14
src/com/cherish/settings/preferences/dslv/ActionListViewSettings.java
View File

@@ -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);