openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove grid options pref key 

Fixes: 154154093
Test: manual testing of the feature
Change-Id: I48fa2788c163ebfe4b925e05d1526c0c1f3e3926
This commit is contained in:
Tracy Zhou 2020-04-28 15:33:30 -07:00
parent df5d99f419
commit 9dd8f411e5
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest-common.xml
View File

@ -156,7 +156,6 @@
<provider
android:name="com.android.launcher3.graphics.GridOptionsProvider"
android:authorities="${packageName}.grid_control"
android:enabled="false"
android:exported="true" />
<!--

31
src/com/android/launcher3/settings/SettingsActivity.java
View File

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