Merge "Remove unused content observer from AssistManager." (5ca43651) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+23 −62

Original line number	Original line	Diff line number	Diff line
	package com.android.systemui.assist;		package com.android.systemui.assist;

			import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.app.ActivityOptions;		import android.app.ActivityOptions;
	import android.app.SearchManager;		import android.app.SearchManager;
	@@ -9,9 +11,7 @@ import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.database.ContentObserver;
	import android.graphics.PixelFormat;		import android.graphics.PixelFormat;
	import android.media.AudioAttributes;
	import android.os.AsyncTask;		import android.os.AsyncTask;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	@@ -21,7 +21,6 @@ import android.provider.Settings;
	import android.service.voice.VoiceInteractionSession;		import android.service.voice.VoiceInteractionSession;
	import android.util.Log;		import android.util.Log;
	import android.view.Gravity;		import android.view.Gravity;
	import android.view.HapticFeedbackConstants;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	import android.view.View;		import android.view.View;
	import android.view.ViewGroup;		import android.view.ViewGroup;
	@@ -33,10 +32,6 @@ import com.android.internal.app.IVoiceInteractionSessionShowCallback;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.statusbar.BaseStatusBar;		import com.android.systemui.statusbar.BaseStatusBar;
	import com.android.systemui.statusbar.CommandQueue;		import com.android.systemui.statusbar.CommandQueue;
	import com.android.systemui.statusbar.phone.PhoneStatusBar;

	import java.io.FileDescriptor;
	import java.io.PrintWriter;

	/**		/**
	* Class to manage everything related to assist in SystemUI.		* Class to manage everything related to assist in SystemUI.
	@@ -58,8 +53,6 @@ public class AssistManager {
	private final BaseStatusBar mBar;		private final BaseStatusBar mBar;
	private final AssistUtils mAssistUtils;		private final AssistUtils mAssistUtils;

	private ComponentName mAssistComponent;

	private IVoiceInteractionSessionShowCallback mShowCallback =		private IVoiceInteractionSessionShowCallback mShowCallback =
	new IVoiceInteractionSessionShowCallback.Stub() {		new IVoiceInteractionSessionShowCallback.Stub() {

	@@ -82,23 +75,11 @@ public class AssistManager {
	}		}
	};		};

	private final ContentObserver mAssistSettingsObserver = new ContentObserver(new Handler()) {
	@Override
	public void onChange(boolean selfChange) {
	updateAssistInfo();
	}
	};

	public AssistManager(BaseStatusBar bar, Context context) {		public AssistManager(BaseStatusBar bar, Context context) {
	mContext = context;		mContext = context;
	mBar = bar;		mBar = bar;
	mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);		mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
	mAssistUtils = new AssistUtils(context);		mAssistUtils = new AssistUtils(context);

	mContext.getContentResolver().registerContentObserver(
	Settings.Secure.getUriFor(Settings.Secure.ASSISTANT), false,
	mAssistSettingsObserver);
	mAssistSettingsObserver.onChange(false);
	mAssistDisclosure = new AssistDisclosure(context, new Handler());		mAssistDisclosure = new AssistDisclosure(context, new Handler());
	}		}

	@@ -123,19 +104,19 @@ public class AssistManager {
	}		}

	public void startAssist(Bundle args) {		public void startAssist(Bundle args) {
	updateAssistInfo();		final ComponentName assistComponent = getAssistInfo();
	if (mAssistComponent == null) {		if (assistComponent == null) {
	return;		return;
	}		}

	final boolean isService = isAssistantService();		final boolean isService = assistComponent.equals(getVoiceInteractorComponentName());
	if (!isService \|\| !isVoiceSessionRunning()) {		if (!isService \|\| !isVoiceSessionRunning()) {
	showOrb();		showOrb(assistComponent, isService);
	mView.postDelayed(mHideRunnable, isService		mView.postDelayed(mHideRunnable, isService
	? TIMEOUT_SERVICE		? TIMEOUT_SERVICE
	: TIMEOUT_ACTIVITY);		: TIMEOUT_ACTIVITY);
	}		}
	startAssistInternal(args);		startAssistInternal(args, assistComponent, isService);
	}		}

	public void hideAssist() {		public void hideAssist() {
	@@ -161,22 +142,21 @@ public class AssistManager {
	return lp;		return lp;
	}		}

	private void showOrb() {		private void showOrb(@NonNull ComponentName assistComponent, boolean isService) {
	maybeSwapSearchIcon();		maybeSwapSearchIcon(assistComponent, isService);
	mView.show(true /* show /, true / animate */);		mView.show(true /* show /, true / animate */);
	}		}

	private void startAssistInternal(Bundle args) {		private void startAssistInternal(Bundle args, @NonNull ComponentName assistComponent,
	if (mAssistComponent != null) {		boolean isService) {
	if (isAssistantService()) {		if (isService) {
	startVoiceInteractor(args);		startVoiceInteractor(args);
	} else {		} else {
	startAssistActivity(args);		startAssistActivity(args, assistComponent);
	}
	}		}
	}		}

	private void startAssistActivity(Bundle args) {		private void startAssistActivity(Bundle args, @NonNull ComponentName assistComponent) {
	if (!mBar.isDeviceProvisioned()) {		if (!mBar.isDeviceProvisioned()) {
	return;		return;
	}		}
	@@ -193,9 +173,7 @@ public class AssistManager {
	if (intent == null) {		if (intent == null) {
	return;		return;
	}		}
	if (mAssistComponent != null) {		intent.setComponent(assistComponent);
	intent.setComponent(mAssistComponent);
	}
	intent.putExtras(args);		intent.putExtras(args);

	if (structureEnabled) {		if (structureEnabled) {
	@@ -243,13 +221,9 @@ public class AssistManager {
	mWindowManager.removeViewImmediate(mView);		mWindowManager.removeViewImmediate(mView);
	}		}

	private void maybeSwapSearchIcon() {		private void maybeSwapSearchIcon(@NonNull ComponentName assistComponent, boolean isService) {
	if (mAssistComponent != null) {		replaceDrawable(mView.getOrb().getLogo(), assistComponent, ASSIST_ICON_METADATA_NAME,
	replaceDrawable(mView.getOrb().getLogo(), mAssistComponent, ASSIST_ICON_METADATA_NAME,		isService);
	isAssistantService());
	} else {
	mView.getOrb().getLogo().setImageDrawable(null);
	}
	}		}

	public void replaceDrawable(ImageView v, ComponentName component, String name,		public void replaceDrawable(ImageView v, ComponentName component, String name,
	@@ -283,28 +257,15 @@ public class AssistManager {
	v.setImageDrawable(null);		v.setImageDrawable(null);
	}		}

	private boolean isAssistantService() {		@Nullable
	return mAssistComponent == null ?		private ComponentName getAssistInfo() {
	false : mAssistComponent.equals(getVoiceInteractorComponentName());		return mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT);
	}

	private void updateAssistInfo() {
	mAssistComponent = mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT);
	}

	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	pw.println("AssistManager state:");
	pw.print(" mAssistComponent="); pw.println(mAssistComponent);
	}		}

	public void showDisclosure() {		public void showDisclosure() {
	mAssistDisclosure.postShow();		mAssistDisclosure.postShow();
	}		}

	public void onUserSwitched(int newUserId) {
	updateAssistInfo();
	}

	public void onLockscreenShown() {		public void onLockscreenShown() {
	mAssistUtils.onLockscreenShown();		mAssistUtils.onLockscreenShown();
	}		}

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2793,9 +2793,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
	if (mNextAlarmController != null) {		if (mNextAlarmController != null) {
	mNextAlarmController.dump(fd, pw, args);		mNextAlarmController.dump(fd, pw, args);
	}		}
	if (mAssistManager != null) {
	mAssistManager.dump(fd, pw, args);
	}
	if (mSecurityController != null) {		if (mSecurityController != null) {
	mSecurityController.dump(fd, pw, args);		mSecurityController.dump(fd, pw, args);
	}		}
	@@ -3031,7 +3028,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
	updateNotifications();		updateNotifications();
	resetUserSetupObserver();		resetUserSetupObserver();
	setControllerUsers();		setControllerUsers();
	mAssistManager.onUserSwitched(newUserId);
	if (mFullscreenUserSwitcher != null) {		if (mFullscreenUserSwitcher != null) {
	mFullscreenUserSwitcher.onUserSwitched(newUserId);		mFullscreenUserSwitcher.onUserSwitched(newUserId);
	}		}