Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5 am: 1966d6c336 (ba41bfb5) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.content.Intent.EXTRA_USER_ID;
		import android.annotation.IntDef;
		import android.app.Activity;
		import android.content.Context;
		import android.content.res.ColorStateList;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		@@ -113,6 +114,7 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
		viewPager.setAdapter(new ProfileSelectFragment.ViewPagerAdapter(this));
		final TabLayout tabs = tabContainer.findViewById(R.id.tabs);
		tabs.setupWithViewPager(viewPager);
		setupTabTextColor(tabs);
		tabContainer.setVisibility(View.VISIBLE);
		final TabLayout.Tab tab = tabs.getTabAt(selectedTab);
		tab.select();
		@@ -129,6 +131,30 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
		return mContentView;
		}

		/**
		* TabLayout uses ColorStateList of 2 states, selected state and empty state.
		* It's expected to use textColorSecondary default state color as empty state tabTextColor.
		*
		* However, TabLayout uses textColorSecondary by a not expected state.
		* This method sets tabTextColor with the color of expected textColorSecondary state.
		*/
		private void setupTabTextColor(TabLayout tabLayout) {
		final ColorStateList defaultColorStateList = tabLayout.getTabTextColors();
		final ColorStateList resultColorStateList = new ColorStateList(
		new int[][]{
		new int[]{android.R.attr.state_selected},
		new int[]{}
		},
		new int[] {
		defaultColorStateList.getColorForState(new int[]{android.R.attr.state_selected},
		Utils.getColorAttrDefaultColor(getContext(),
		com.android.internal.R.attr.colorAccentPrimaryVariant)),
		Utils.getColorAttrDefaultColor(getContext(), android.R.attr.textColorSecondary)
		}
		);
		tabLayout.setTabTextColors(resultColorStateList);
		}

		@Override
		public int getMetricsCategory() {
		return METRICS_CATEGORY_UNKNOWN;