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

Commit 42de4ddc authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Remove grid options pref key" into ub-launcher3-rvc-dev

parents d4066f58 9dd8f411

AndroidManifest-common.xml

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
        <provider

            android:name="com.android.launcher3.graphics.GridOptionsProvider"

            android:authorities="${packageName}.grid_control"

            android:enabled="false"

            android:exported="true" />



        <!--

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

+1 −30
Original line number Diff line number Diff line
@@ -23,10 +23,7 @@ import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERE 
import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;

import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;



import android.content.ComponentName;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;
@@ -48,7 +45,6 @@ import com.android.launcher3.LauncherFiles; 
import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.graphics.GridOptionsProvider;

import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;

import com.android.launcher3.util.SecureSettingsObserver;
@@ -71,8 +67,6 @@ public class SettingsActivity extends FragmentActivity 
    private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;

    public static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";



    private static final String GRID_OPTIONS_PREFERENCE_KEY = "pref_grid_options";



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -95,26 +89,7 @@ public class SettingsActivity extends FragmentActivity 
    }



    @Override

    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {

        if (GRID_OPTIONS_PREFERENCE_KEY.equals(key)) {



            final ComponentName cn = new ComponentName(getApplicationContext(),

                    GridOptionsProvider.class);

            Context c = getApplicationContext();

            int oldValue = c.getPackageManager().getComponentEnabledSetting(cn);

            int newValue;

            if (Utilities.getPrefs(c).getBoolean(GRID_OPTIONS_PREFERENCE_KEY, false)) {

                newValue = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;

            } else {

                newValue = PackageManager.COMPONENT_ENABLED_STATE_DISABLED;

            }



            if (oldValue != newValue) {

                c.getPackageManager().setComponentEnabledSetting(cn, newValue,

                        PackageManager.DONT_KILL_APP);

            }

        }

    }

    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }



    private boolean startFragment(String fragment, Bundle args, String key) {

        if (Utilities.ATLEAST_P && getSupportFragmentManager().isStateSaved()) {
@@ -233,10 +208,6 @@ public class SettingsActivity extends FragmentActivity 
                    // Show if plugins are enabled or flag UI is enabled.

                    return FeatureFlags.showFlagTogglerUi(getContext()) ||

                            PluginManagerWrapper.hasPlugins(getContext());

                case GRID_OPTIONS_PREFERENCE_KEY:

                    return Utilities.isDevelopersOptionsEnabled(getContext()) &&

                            Utilities.IS_DEBUG_DEVICE &&

                            Utilities.existsStyleWallpapers(getContext());

            }



            return true;