Redesign homepage IA icon
- remove the outer circle of the icons - tint the icons including injected ones Test: robotest, visual Bug: 182870640 Change-Id: If72c37152f4f0d68e25149b11d497eef1c7ece91
This commit is contained in:
@@ -25,7 +25,6 @@ import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.os.UserHandle;
|
||||
import android.text.TextUtils;
|
||||
import android.util.FeatureFlagUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
@@ -33,8 +32,6 @@ import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.FeatureFlags;
|
||||
import com.android.settings.homepage.RestrictedHomepagePreference;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.RestrictedTopLevelPreference;
|
||||
|
||||
@@ -92,11 +89,7 @@ public class TopLevelWallpaperPreferenceController extends BasePreferenceControl
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
|
||||
disablePreferenceIfManaged((RestrictedHomepagePreference) preference);
|
||||
} else {
|
||||
disablePreferenceIfManaged((RestrictedTopLevelPreference) preference);
|
||||
}
|
||||
disablePreferenceIfManaged((RestrictedTopLevelPreference) preference);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -140,18 +133,4 @@ public class TopLevelWallpaperPreferenceController extends BasePreferenceControl
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void disablePreferenceIfManaged(RestrictedHomepagePreference pref) {
|
||||
final String restriction = DISALLOW_SET_WALLPAPER;
|
||||
if (pref != null) {
|
||||
pref.setDisabledByAdmin(null);
|
||||
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
|
||||
restriction, UserHandle.myUserId())) {
|
||||
// Do not show the admin dialog for system restriction.
|
||||
pref.setEnabled(false);
|
||||
} else {
|
||||
pref.checkRestrictionAndSetDisabled(restriction);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user