Merge "DO NOT MERGE Update volume dialog colors" into pi-dev (aa8391d5) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/volume_dialog.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@
	android:layout_gravity="center"		android:layout_gravity="center"
	android:contentDescription="@string/accessibility_volume_settings"		android:contentDescription="@string/accessibility_volume_settings"
	android:background="@drawable/ripple_drawable_20dp"		android:background="@drawable/ripple_drawable_20dp"
	android:tint="?android:attr/textColorHint"		android:tint="?android:attr/textColorSecondary"
	android:soundEffectsEnabled="false" />		android:soundEffectsEnabled="false" />
	</FrameLayout>		</FrameLayout>
	</LinearLayout>		</LinearLayout>

packages/SystemUI/res/values/colors.xml

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -125,9 +125,6 @@
	<color name="light_mode_icon_color_dual_tone_background">#4dffffff</color>		<color name="light_mode_icon_color_dual_tone_background">#4dffffff</color>
	<color name="light_mode_icon_color_dual_tone_fill">#ffffff</color>		<color name="light_mode_icon_color_dual_tone_fill">#ffffff</color>

	<color name="volume_settings_icon_color">#7fffffff</color>
	<color name="volume_slider_inactive">@*android:color/quaternary_device_default_settings</color>

	<color name="docked_divider_background">#ff000000</color>		<color name="docked_divider_background">#ff000000</color>
	<color name="docked_divider_handle">#ffffff</color>		<color name="docked_divider_handle">#ffffff</color>
	<drawable name="forced_resizable_background">#59000000</drawable>		<drawable name="forced_resizable_background">#59000000</drawable>

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+24 −8

Original line number	Original line	Diff line number	Diff line
	@@ -43,8 +43,10 @@ import android.content.Intent;
	import android.content.res.ColorStateList;		import android.content.res.ColorStateList;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	import android.content.res.Resources;		import android.content.res.Resources;
			import android.content.res.TypedArray;
	import android.graphics.Color;		import android.graphics.Color;
	import android.graphics.PixelFormat;		import android.graphics.PixelFormat;
			import android.graphics.PorterDuff;
	import android.graphics.drawable.ColorDrawable;		import android.graphics.drawable.ColorDrawable;
	import android.media.AudioManager;		import android.media.AudioManager;
	import android.media.AudioSystem;		import android.media.AudioSystem;
	@@ -90,6 +92,7 @@ import com.android.systemui.plugins.VolumeDialog;
	import com.android.systemui.plugins.VolumeDialogController;		import com.android.systemui.plugins.VolumeDialogController;
	import com.android.systemui.plugins.VolumeDialogController.State;		import com.android.systemui.plugins.VolumeDialogController.State;
	import com.android.systemui.plugins.VolumeDialogController.StreamState;		import com.android.systemui.plugins.VolumeDialogController.StreamState;
			import com.android.systemui.statusbar.phone.StatusBar;
	import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;		import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;
	import com.android.systemui.statusbar.policy.DeviceProvisionedController;		import com.android.systemui.statusbar.policy.DeviceProvisionedController;

	@@ -131,8 +134,10 @@ public class VolumeDialogImpl implements VolumeDialog {
	private final AccessibilityManagerWrapper mAccessibilityMgr;		private final AccessibilityManagerWrapper mAccessibilityMgr;
	private final Object mSafetyWarningLock = new Object();		private final Object mSafetyWarningLock = new Object();
	private final Accessibility mAccessibility = new Accessibility();		private final Accessibility mAccessibility = new Accessibility();
	private final ColorStateList mActiveTint;		private ColorStateList mActiveTint;
	private final ColorStateList mInactiveTint;		private int mActiveAlpha;
			private ColorStateList mInactiveTint;
			private int mInactiveAlpha;

	private boolean mShowing;		private boolean mShowing;
	private boolean mShowA11yStream;		private boolean mShowA11yStream;
	@@ -150,8 +155,6 @@ public class VolumeDialogImpl implements VolumeDialog {
	mController = Dependency.get(VolumeDialogController.class);		mController = Dependency.get(VolumeDialogController.class);
	mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);		mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
	mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);		mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);
	mActiveTint = ColorStateList.valueOf(Utils.getColorAccent(mContext));
	mInactiveTint = loadColorStateList(R.color.volume_slider_inactive);
	mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);		mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);
	}		}

	@@ -224,6 +227,12 @@ public class VolumeDialogImpl implements VolumeDialog {
	return true;		return true;
	});		});

			mActiveTint = ColorStateList.valueOf(Utils.getColorAccent(mContext));
			mActiveAlpha = Color.alpha(mActiveTint.getDefaultColor());
			mInactiveTint = ColorStateList.valueOf(
			Utils.getColorAttr(mContext, android.R.attr.colorForeground));
			mInactiveAlpha = getAlphaAttr(android.R.attr.secondaryContentAlpha);

	mDialogRowsView = mDialog.findViewById(R.id.volume_dialog_rows);		mDialogRowsView = mDialog.findViewById(R.id.volume_dialog_rows);
	mRinger = mDialog.findViewById(R.id.ringer);		mRinger = mDialog.findViewById(R.id.ringer);
	mRingerIcon = mRinger.findViewById(R.id.ringer_icon);		mRingerIcon = mRinger.findViewById(R.id.ringer_icon);
	@@ -263,8 +272,11 @@ public class VolumeDialogImpl implements VolumeDialog {
	return mDialogView;		return mDialogView;
	}		}

	private ColorStateList loadColorStateList(int colorResId) {		private int getAlphaAttr(int attr) {
	return ColorStateList.valueOf(mContext.getColor(colorResId));		TypedArray ta = mContext.obtainStyledAttributes(new int[]{attr});
			float alpha = ta.getFloat(0, 0);
			ta.recycle();
			return (int) (alpha * 255);
	}		}

	private boolean isLandscape() {		private boolean isLandscape() {
	@@ -890,12 +902,16 @@ public class VolumeDialogImpl implements VolumeDialog {
	if (isActive) {		if (isActive) {
	row.slider.requestFocus();		row.slider.requestFocus();
	}		}
	final ColorStateList tint = isActive && row.slider.isEnabled() ? mActiveTint		boolean useActiveColoring = isActive && row.slider.isEnabled();
	: mInactiveTint;		final ColorStateList tint = useActiveColoring ? mActiveTint : mInactiveTint;
			final int alpha = useActiveColoring ? mActiveAlpha : mInactiveAlpha;
	if (tint == row.cachedTint) return;		if (tint == row.cachedTint) return;
	row.slider.setProgressTintList(tint);		row.slider.setProgressTintList(tint);
	row.slider.setThumbTintList(tint);		row.slider.setThumbTintList(tint);
			row.slider.setProgressBackgroundTintList(tint);
			row.slider.setAlpha(((float) alpha) / 255);
	row.icon.setImageTintList(tint);		row.icon.setImageTintList(tint);
			row.icon.setImageAlpha(alpha);
	row.cachedTint = tint;		row.cachedTint = tint;
	}		}