Fix: Don't display the lock clock preference if its not installed (90f2ec1c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DeviceInfoSettings.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.settings;
		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.SELinux;
		@@ -414,22 +413,4 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {

		return result;
		}

		private boolean removePreferenceIfPackageNotInstalled(Preference preference) {
		String intentUri=((PreferenceScreen) preference).getIntent().toUri(1);
		Pattern pattern = Pattern.compile("component=([^/]+)/");
		Matcher matcher = pattern.matcher(intentUri);

		String packageName=matcher.find()?matcher.group(1):null;
		if(packageName != null) {
		try {
		getPackageManager().getPackageInfo(packageName, 0);
		} catch (NameNotFoundException e) {
		Log.e(LOG_TAG,"package "+packageName+" not installed, hiding preference.");
		getPreferenceScreen().removePreference(preference);
		return true;
		}
		}
		return false;
		}
		}

src/com/android/settings/SettingsPreferenceFragment.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -23,11 +23,13 @@ import android.content.ContentResolver;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.net.Uri;
		import android.os.Bundle;
		import android.preference.Preference;
		import android.preference.PreferenceActivity;
		import android.preference.PreferenceFragment;
		import android.preference.PreferenceScreen;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.Menu;
		@@ -35,6 +37,9 @@ import android.view.MenuInflater;
		import android.view.MenuItem;
		import android.widget.Button;

		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		/**
		* Base class for Settings fragments, with some helper functions and dialog management.
		*/
		@@ -307,4 +312,21 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
		}
		}

		public boolean removePreferenceIfPackageNotInstalled(Preference preference) {
		String intentUri = ((PreferenceScreen) preference).getIntent().toUri(1);
		Pattern pattern = Pattern.compile("component=([^/]+)/");
		Matcher matcher = pattern.matcher(intentUri);

		String packageName = matcher.find() ? matcher.group(1) : null;
		if (packageName != null) {
		try {
		getPackageManager().getPackageInfo(packageName, 0);
		} catch (NameNotFoundException e) {
		Log.e(TAG, "package " + packageName + " not installed, hiding preference.");
		getPreferenceScreen().removePreference(preference);
		return true;
		}
		}
		return false;
		}
		}

src/com/android/settings/cyanogenmod/LockscreenInterface.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ public class LockscreenInterface extends SettingsPreferenceFragment implements

		private static final String KEY_ALWAYS_BATTERY = "lockscreen_battery_status";
		private static final String KEY_LOCKSCREEN_BUTTONS = "lockscreen_buttons";
		private static final String KEY_LOCK_CLOCK = "lock_clock";
		private static final String KEY_LOCKSCREEN_MAXIMIZE_WIDGETS = "lockscreen_maximize_widgets";
		private static final String KEY_BACKGROUND = "lockscreen_background";
		private static final String KEY_SCREEN_SECURITY = "screen_security";
		@@ -118,6 +119,9 @@ public class LockscreenInterface extends SettingsPreferenceFragment implements

		mWallpaperImage = new File(getActivity().getFilesDir() + "/lockwallpaper");
		mWallpaperTemporary = new File(getActivity().getCacheDir() + "/lockwallpaper.tmp");

		// Don't display the lock clock preference if its not installed
		removePreferenceIfPackageNotInstalled(findPreference(KEY_LOCK_CLOCK));
		}

		private void updateCustomBackgroundSummary() {

src/com/android/settings/cyanogenmod/SystemSettings.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.settings.cyanogenmod;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.os.RemoteException;
		@@ -36,9 +35,6 @@ import android.view.WindowManagerGlobal;
		import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;

		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		public class SystemSettings extends SettingsPreferenceFragment implements
		Preference.OnPreferenceChangeListener {
		private static final String TAG = "SystemSettings";
		@@ -235,24 +231,6 @@ public class SystemSettings extends SettingsPreferenceFragment implements
		}
		}

		private boolean removePreferenceIfPackageNotInstalled(Preference preference) {
		String intentUri = ((PreferenceScreen) preference).getIntent().toUri(1);
		Pattern pattern = Pattern.compile("component=([^/]+)/");
		Matcher matcher = pattern.matcher(intentUri);

		String packageName = matcher.find() ? matcher.group(1) : null;
		if (packageName != null) {
		try {
		getPackageManager().getPackageInfo(packageName, 0);
		} catch (NameNotFoundException e) {
		Log.e(TAG, "package " + packageName + " not installed, hiding preference.");
		getPreferenceScreen().removePreference(preference);
		return true;
		}
		}
		return false;
		}

		private void updateExpandedDesktop(int value) {
		ContentResolver cr = getContentResolver();
		Resources res = getResources();