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

Revert "Add an option allowing to skip wallpaper apps selection."

Browse Source 
This reverts commit fe4e80b98b.

This change is covered in https://googleplex-android-review.git.corp.google.com/#/c/1075489/

Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244
This commit is contained in:
Sunny Goyal
2016-05-25 21:08:47 +00:00
parent fe4e80b98b
commit 1598d73c12
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DisplaySettings.java
View File

@@ -19,11 +19,11 @@ package com.android.settings;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.UiModeManager;
import android.app.WallpaperManager;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.ComponentName;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -66,6 +66,7 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -251,16 +252,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
mNightModePreference.setValue(String.valueOf(currentNightMode));
mNightModePreference.setOnPreferenceChangeListener(this);
}
// Check if we want to skip the wallpaper options and lead to the wallpaper picker directly.
String wallpaperPicker = getResources().getString(R.string.wallpaper_picker);
if (!wallpaperPicker.isEmpty()) {
final RestrictedPreference pref = (RestrictedPreference) findPreference(KEY_WALLPAPER);
final Intent intent = new Intent();
intent.setComponent(ComponentName.unflattenFromString(wallpaperPicker));
pref.setFragment(null);
pref.setIntent(intent);
}
}
private static boolean allowAllRotations(Context context) {