[DO NOT MERGE] Remove selection toolbar code from build time

The feature punts to QPR so disable or remove code from the build
time.

Bug: 222185402
Test: build pass and can boot to home
Test: make sure the toolbar using local implementation

Change-Id: Idad82c3c46ddce0731a26f4599de01eecb0e52c3
This commit is contained in:
Joanne Chung 2022-05-04 21:41:14 +08:00
parent 1d1d37ca68
commit ade911b9c7
6 changed files with 9 additions and 47 deletions

View File

@ -15,6 +15,14 @@ filegroup {
"**/*.java",
"**/*.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"],
}

View File

@ -230,8 +230,6 @@ import android.view.contentcapture.ContentCaptureManager;
import android.view.contentcapture.IContentCaptureManager;
import android.view.displayhash.DisplayHashManager;
import android.view.inputmethod.InputMethodManager;
import android.view.selectiontoolbar.ISelectionToolbarManager;
import android.view.selectiontoolbar.SelectionToolbarManager;
import android.view.textclassifier.TextClassificationManager;
import android.view.textservice.TextServicesManager;
import android.view.translation.ITranslationManager;
@ -365,15 +363,6 @@ public final class SystemServiceRegistry {
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,
new CachedServiceFetcher<FontManager>() {
@Override

View File

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

View File

@ -102,7 +102,6 @@ filegroup {
":services.profcollect-sources",
":services.restrictions-sources",
":services.searchui-sources",
":services.selectiontoolbar-sources",
":services.smartspace-sources",
":services.speech-sources",
":services.systemcaptions-sources",
@ -158,7 +157,6 @@ java_library {
"services.profcollect",
"services.restrictions",
"services.searchui",
"services.selectiontoolbar",
"services.smartspace",
"services.speech",
"services.systemcaptions",

View File

@ -338,8 +338,6 @@ public final class SystemServer implements Dumpable {
"com.android.server.contentcapture.ContentCaptureManagerService";
private static final String TRANSLATION_MANAGER_SERVICE_CLASS =
"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 =
"com.android.server.musicrecognition.MusicRecognitionManagerService";
private static final String SYSTEM_CAPTIONS_MANAGER_SERVICE_CLASS =
@ -2635,11 +2633,6 @@ public final class SystemServer implements Dumpable {
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
t.traceBegin("StartClipboardService");
mSystemServiceManager.startService(ClipboardService.class);

View File

@ -1,22 +0,0 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "frameworks_base_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["frameworks_base_license"],
}
filegroup {
name: "services.selectiontoolbar-sources",
srcs: ["java/**/*.java"],
path: "java",
visibility: ["//frameworks/base/services"],
}
java_library_static {
name: "services.selectiontoolbar",
defaults: ["platform_service_defaults"],
srcs: [":services.selectiontoolbar-sources"],
libs: ["services.core"],
}