Merge "[DO NOT MERGE] Revert "Revert "[DO NOT MERGE] Remove selection toolbar... (990b2f26) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,14 @@ filegroup {
	"*/.java",		"*/.java",
	"*/.aidl",		"*/.aidl",
	],		],
			exclude_srcs: [
			// Remove election toolbar code from build time
			"android/service/selectiontoolbar/*.aidl",
			"android/service/selectiontoolbar/*.java",
			"android/view/selectiontoolbar/*.aidl",
			"android/view/selectiontoolbar/*.java",
			"com/android/internal/widget/floatingtoolbar/RemoteFloatingToolbarPopup.java",
			],
	visibility: ["//frameworks/base"],		visibility: ["//frameworks/base"],
	}		}

core/java/android/app/SystemServiceRegistry.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -228,8 +228,6 @@ import android.view.contentcapture.ContentCaptureManager;
	import android.view.contentcapture.IContentCaptureManager;		import android.view.contentcapture.IContentCaptureManager;
	import android.view.displayhash.DisplayHashManager;		import android.view.displayhash.DisplayHashManager;
	import android.view.inputmethod.InputMethodManager;		import android.view.inputmethod.InputMethodManager;
	import android.view.selectiontoolbar.ISelectionToolbarManager;
	import android.view.selectiontoolbar.SelectionToolbarManager;
	import android.view.textclassifier.TextClassificationManager;		import android.view.textclassifier.TextClassificationManager;
	import android.view.textservice.TextServicesManager;		import android.view.textservice.TextServicesManager;
	import android.view.translation.ITranslationManager;		import android.view.translation.ITranslationManager;
	@@ -363,15 +361,6 @@ public final class SystemServiceRegistry {
	return new TextClassificationManager(ctx);		return new TextClassificationManager(ctx);
	}});		}});

	registerService(Context.SELECTION_TOOLBAR_SERVICE, SelectionToolbarManager.class,
	new CachedServiceFetcher<SelectionToolbarManager>() {
	@Override
	public SelectionToolbarManager createService(ContextImpl ctx) {
	IBinder b = ServiceManager.getService(Context.SELECTION_TOOLBAR_SERVICE);
	return new SelectionToolbarManager(ctx.getOuterContext(),
	ISelectionToolbarManager.Stub.asInterface(b));
	}});

	registerService(Context.FONT_SERVICE, FontManager.class,		registerService(Context.FONT_SERVICE, FontManager.class,
	new CachedServiceFetcher<FontManager>() {		new CachedServiceFetcher<FontManager>() {
	@Override		@Override

core/java/com/android/internal/widget/floatingtoolbar/FloatingToolbarPopup.java

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ import android.content.Context;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.view.MenuItem;		import android.view.MenuItem;
	import android.view.View;		import android.view.View;
	import android.view.selectiontoolbar.SelectionToolbarManager;
	import android.widget.PopupWindow;		import android.widget.PopupWindow;

	import java.util.List;		import java.util.List;
	@@ -93,10 +92,7 @@ public interface FloatingToolbarPopup {
	* enabled, otherwise returns {@link LocalFloatingToolbarPopup} implementation.		* enabled, otherwise returns {@link LocalFloatingToolbarPopup} implementation.
	*/		*/
	static FloatingToolbarPopup createInstance(Context context, View parent) {		static FloatingToolbarPopup createInstance(Context context, View parent) {
	boolean enabled = SelectionToolbarManager.isRemoteSelectionToolbarEnabled(context);		return new LocalFloatingToolbarPopup(context, parent);
	return enabled
	? new RemoteFloatingToolbarPopup(context, parent)
	: new LocalFloatingToolbarPopup(context, parent);
	}		}

	}		}

services/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,6 @@ filegroup {
	":services.profcollect-sources",		":services.profcollect-sources",
	":services.restrictions-sources",		":services.restrictions-sources",
	":services.searchui-sources",		":services.searchui-sources",
	":services.selectiontoolbar-sources",
	":services.smartspace-sources",		":services.smartspace-sources",
	":services.speech-sources",		":services.speech-sources",
	":services.systemcaptions-sources",		":services.systemcaptions-sources",
	@@ -156,7 +155,6 @@ java_library {
	"services.profcollect",		"services.profcollect",
	"services.restrictions",		"services.restrictions",
	"services.searchui",		"services.searchui",
	"services.selectiontoolbar",
	"services.smartspace",		"services.smartspace",
	"services.speech",		"services.speech",
	"services.systemcaptions",		"services.systemcaptions",

services/java/com/android/server/SystemServer.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -338,8 +338,6 @@ public final class SystemServer implements Dumpable {
	"com.android.server.contentcapture.ContentCaptureManagerService";		"com.android.server.contentcapture.ContentCaptureManagerService";
	private static final String TRANSLATION_MANAGER_SERVICE_CLASS =		private static final String TRANSLATION_MANAGER_SERVICE_CLASS =
	"com.android.server.translation.TranslationManagerService";		"com.android.server.translation.TranslationManagerService";
	private static final String SELECTION_TOOLBAR_MANAGER_SERVICE_CLASS =
	"com.android.server.selectiontoolbar.SelectionToolbarManagerService";
	private static final String MUSIC_RECOGNITION_MANAGER_SERVICE_CLASS =		private static final String MUSIC_RECOGNITION_MANAGER_SERVICE_CLASS =
	"com.android.server.musicrecognition.MusicRecognitionManagerService";		"com.android.server.musicrecognition.MusicRecognitionManagerService";
	private static final String SYSTEM_CAPTIONS_MANAGER_SERVICE_CLASS =		private static final String SYSTEM_CAPTIONS_MANAGER_SERVICE_CLASS =
	@@ -2628,11 +2626,6 @@ public final class SystemServer implements Dumpable {
	Slog.d(TAG, "TranslationService not defined by OEM");		Slog.d(TAG, "TranslationService not defined by OEM");
	}		}

	// Selection toolbar service
	t.traceBegin("StartSelectionToolbarManagerService");
	mSystemServiceManager.startService(SELECTION_TOOLBAR_MANAGER_SERVICE_CLASS);
	t.traceEnd();

	// NOTE: ClipboardService depends on ContentCapture and Autofill		// NOTE: ClipboardService depends on ContentCapture and Autofill
	t.traceBegin("StartClipboardService");		t.traceBegin("StartClipboardService");
	mSystemServiceManager.startService(ClipboardService.class);		mSystemServiceManager.startService(ClipboardService.class);