Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa4bfeb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "fix app crash on settings for launcher" into ub-launcher3-master

parents 372694ee 80634893

src/com/android/launcher3/config/FlagTogglerPrefUi.java

+7 −7
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ import android.view.Menu; 
import android.view.MenuItem;

import android.widget.Toast;



import com.android.launcher3.R;

import com.android.launcher3.config.FeatureFlags.BaseTogglableFlag;

import com.android.launcher3.uioverrides.TogglableFlag;



import androidx.preference.PreferenceDataStore;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceGroup;

import androidx.preference.SwitchPreference;



import com.android.launcher3.R;

import com.android.launcher3.config.FeatureFlags.BaseTogglableFlag;

import com.android.launcher3.uioverrides.TogglableFlag;



/**

 * Dev-build only UI allowing developers to toggle flag settings. See {@link FeatureFlags}.

 */
@@ -41,7 +41,7 @@ public final class FlagTogglerPrefUi { 


    private static final String TAG = "FlagTogglerPrefFrag";



    private final PreferenceFragment mFragment;

    private final PreferenceFragmentCompat mFragment;

    private final Context mContext;

    private final SharedPreferences mSharedPreferences;
@@ -72,7 +72,7 @@ public final class FlagTogglerPrefUi { 
        }

    };



    public FlagTogglerPrefUi(PreferenceFragment fragment) {

    public FlagTogglerPrefUi(PreferenceFragmentCompat fragment) {

        mFragment = fragment;

        mContext = fragment.getActivity();

        mSharedPreferences = mContext.getSharedPreferences(

src/com/android/launcher3/settings/DeveloperOptionsFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import android.view.View; 
import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceDataStore;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceScreen;

import androidx.preference.PreferenceViewHolder;

import androidx.preference.SwitchPreference;
@@ -64,7 +64,7 @@ import java.util.stream.Collectors; 
 * See {@link FeatureFlags}.

 */

@TargetApi(Build.VERSION_CODES.O)

public class DeveloperOptionsFragment extends PreferenceFragment {

public class DeveloperOptionsFragment extends PreferenceFragmentCompat {



    private static final String ACTION_PLUGIN_SETTINGS = "com.android.systemui.action.PLUGIN_SETTINGS";

    private static final String PLUGIN_PERMISSION = "com.android.systemui.permission.PLUGIN";