Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40 am: 3f638ebad8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469

Change-Id: I8a3deba2be06113f781f399221a8463f5454ceee
This commit is contained in:
Greg Kaiser
2021-10-08 15:12:13 +00:00
committed by Automerger Merge Worker
18 changed files with 91 additions and 775 deletions

View File

@@ -1223,14 +1223,6 @@ public final class Utils extends com.android.settingslib.Utils {
return getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
}
/**
* Returns the highlight color of homepage preference icons.
*/
@ColorInt
public static int getHomepageIconColorHighlight(Context context) {
return getColorAttrDefaultColor(context, android.R.attr.textColorSecondaryInverse);
}
public static boolean isProviderModelEnabled(Context context) {
return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
}