Merge "Add icon to current screen saver preference" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
beb92c325a
@@ -20,8 +20,10 @@ import android.content.Context;
|
|||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.Utils;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.widget.GearPreference;
|
import com.android.settings.widget.GearPreference;
|
||||||
|
import com.android.settingslib.RestrictedPreference;
|
||||||
import com.android.settingslib.dream.DreamBackend;
|
import com.android.settingslib.dream.DreamBackend;
|
||||||
import com.android.settingslib.dream.DreamBackend.DreamInfo;
|
import com.android.settingslib.dream.DreamBackend.DreamInfo;
|
||||||
|
|
||||||
@@ -45,6 +47,7 @@ public class CurrentDreamPreferenceController extends BasePreferenceController {
|
|||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
super.updateState(preference);
|
super.updateState(preference);
|
||||||
setGearClickListenerForPreference(preference);
|
setGearClickListenerForPreference(preference);
|
||||||
|
setActiveDreamIcon(preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -78,4 +81,13 @@ public class CurrentDreamPreferenceController extends BasePreferenceController {
|
|||||||
.filter((info) -> info.isActive)
|
.filter((info) -> info.isActive)
|
||||||
.findFirst();
|
.findFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void setActiveDreamIcon(Preference preference) {
|
||||||
|
if (!(preference instanceof GearPreference)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final GearPreference gearPref = (GearPreference) preference;
|
||||||
|
gearPref.setIconSize(RestrictedPreference.ICON_SIZE_SMALL);
|
||||||
|
Utils.setSafeIcon(gearPref, mBackend.getActiveIcon());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user