From 1598d73c124a9b42750e849eb0b06c1e1cecd295 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 25 May 2016 21:08:47 +0000
Subject: [PATCH] Revert "Add an option allowing to skip wallpaper apps
 selection."

This reverts commit fe4e80b98bc8ff38800461fd7f263d4322b929ad.

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

Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244
---
 res/values/config.xml                         |  4 ----
 src/com/android/settings/DisplaySettings.java | 15 +++------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 9d0ec17c241..6cae9cfa6ee 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -40,8 +40,4 @@
 
     <!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
     <string name="config_featureFactory" translatable="false">com.android.settings.overlay.FeatureFactoryImpl</string>
-
-    <!-- Whether we skip the wallpaper options, and lead to the wallpaper picker directly -->
-    <string name="wallpaper_picker" translatable="false"></string>
-
 </resources>
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index c1bd774730b..8e389a930c5 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -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) {