PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable Wallpaper setting when Wallpaper is disabled.

Browse Source 
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I1afba6639a2b94f9d57f546c220f417092f92387
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Bug: 63939450
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-07-25 11:33:40 -07:00
parent 7030ceb9e3
commit 5df37ec7b9
2 changed files with 122 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/display/WallpaperPreferenceController.java
View File

@@ -13,10 +13,17 @@
*/
package com.android.settings.display;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
@@ -24,18 +31,38 @@ import com.android.settingslib.core.AbstractPreferenceController;
import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
import java.util.List;
public class WallpaperPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
private static final String TAG = "WallpaperPrefController";
public static final String KEY_WALLPAPER = "wallpaper";
private final String mWallpaperPackage;
private final String mWallpaperClass;
public WallpaperPreferenceController(Context context) {
super(context);
mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
}
@Override
public boolean isAvailable() {
return true;
if (TextUtils.isEmpty(mWallpaperPackage) || TextUtils.isEmpty(mWallpaperClass)) {
Log.e(TAG, "No Wallpaper picker specified!");
return false;
}
final ComponentName componentName =
new ComponentName(mWallpaperPackage, mWallpaperClass);
final PackageManager pm = mContext.getPackageManager();
final Intent intent = new Intent();
intent.setComponent(componentName);
final List<ResolveInfo> resolveInfos =
pm.queryIntentActivities(intent, 0 /* flags */);
return resolveInfos != null && resolveInfos.size() != 0;
}
@Override