Do not dim icons when Preference is Disabled

Change DimmableIconPreference into RestrictedPreference so
that the app icon background no longer turns darker

Fixes: 65207948
Test: Manual using settings app, Run SettingsRoboTests
Change-Id: I1c458439006c9d07642b9ef35455e845cb5545e6
This commit is contained in:
jeffreyhuang
2017-09-11 14:42:11 -07:00
parent 2260e8ac26
commit 5152bf87b0

View File

@@ -35,7 +35,6 @@ import android.util.Log;
import android.widget.Switch; import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.DimmableIconPreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -43,6 +42,7 @@ import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.dashboard.SummaryLoader; import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps;
@@ -207,8 +207,8 @@ public class LocationSettings extends LocationSettingsBase
List<Preference> recentLocationPrefs = new ArrayList<>(recentLocationRequests.size()); List<Preference> recentLocationPrefs = new ArrayList<>(recentLocationRequests.size());
for (final RecentLocationApps.Request request : recentLocationRequests) { for (final RecentLocationApps.Request request : recentLocationRequests) {
DimmableIconPreference pref = new DimmableIconPreference(getPrefContext(), RestrictedPreference pref = new RestrictedPreference(getPrefContext());
request.contentDescription); pref.setSummary(request.contentDescription);
pref.setIcon(request.icon); pref.setIcon(request.icon);
pref.setTitle(request.label); pref.setTitle(request.label);
pref.setOnPreferenceClickListener( pref.setOnPreferenceClickListener(