Merge "Add support for a custom left affordance icon" (bb8a8183) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.res.Configuration;
		import android.graphics.drawable.Drawable;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.IBinder;
		@@ -143,6 +144,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL

		private boolean mLeftIsVoiceAssist;
		private AssistManager mAssistManager;
		private Drawable mLeftAssistIcon;

		private IntentButton mRightButton = new DefaultRightButton();
		private IntentButton mLeftButton = new DefaultLeftButton();
		@@ -348,6 +350,14 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		? View.VISIBLE : View.GONE);
		}

		/**
		* Set an alternate icon for the left assist affordance (replace the mic icon)
		*/
		public void setLeftAssistIcon(Drawable drawable) {
		mLeftAssistIcon = drawable;
		updateLeftAffordanceIcon();
		}

		private void updateLeftAffordanceIcon() {
		IconState state = mLeftButton.getIcon();
		mLeftAffordanceView.setVisibility(state.isVisible ? View.VISIBLE : View.GONE);
		@@ -814,7 +824,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		mLeftIsVoiceAssist = canLaunchVoiceAssist();
		if (mLeftIsVoiceAssist) {
		mIconState.isVisible = mUserSetupComplete;
		if (mLeftAssistIcon == null) {
		mIconState.drawable = mContext.getDrawable(R.drawable.ic_mic_26dp);
		} else {
		mIconState.drawable = mLeftAssistIcon;
		}
		mIconState.contentDescription = mContext.getString(
		R.string.accessibility_voice_assist_button);
		} else {