Remove SysUiServiceProvider and mComponents. (95754e70) · Commits · e / os / android_frameworks_base

packages/SystemUI/README.md

+0 −6

Original line number	Diff line number	Diff line
		@@ -24,12 +24,6 @@ the main path for onConfigurationChanged, now also happens through
		ConfigurationController). They also receive a callback for onBootCompleted
		since these objects may be started before the device has finished booting.

		SystemUI and SystemUIApplication also have methods for putComponent and
		getComponent which were existing systems to get a hold of other parts of
		sysui before Dependency existed. Generally new things should not be added
		to putComponent, instead Dependency and other refactoring is preferred to
		make sysui structure cleaner.

		Each SystemUI service is expected to be a major part of system ui and the
		goal is to minimize communication between them. So in general they should be
		relatively silo'd.

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
		* except in compliance with the License. You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software distributed under the
		* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
		* KIND, either express or implied. See the License for the specific language governing
		* permissions and limitations under the License.
		*/

		package com.android.systemui;

		import android.content.Context;

		/**
		* The interface for getting core components of SysUI. Exists for Testability
		* since tests don't have SystemUIApplication as their ApplicationContext.
		*/
		public interface SysUiServiceProvider {
		<T> T getComponent(Class<T> interfaceType);

		public static <T> T getComponent(Context context, Class<T> interfaceType) {
		return ((SysUiServiceProvider) context.getApplicationContext()).getComponent(interfaceType);
		}
		}

+1 −14

Original line number	Diff line number	Diff line
		@@ -23,11 +23,9 @@ import android.os.Bundle;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Map;

		public abstract class SystemUI implements SysUiServiceProvider {
		public abstract class SystemUI {
		protected final Context mContext;
		public Map<Class<?>, Object> mComponents;

		public SystemUI(Context context) {
		mContext = context;
		@@ -44,17 +42,6 @@ public abstract class SystemUI implements SysUiServiceProvider {
		protected void onBootCompleted() {
		}

		@SuppressWarnings("unchecked")
		public <T> T getComponent(Class<T> interfaceType) {
		return (T) (mComponents != null ? mComponents.get(interfaceType) : null);
		}

		public <T, C extends T> void putComponent(Class<T> interfaceType, C component) {
		if (mComponents != null) {
		mComponents.put(interfaceType, component);
		}
		}

		public static void overrideNotificationAppName(Context context, Notification.Builder n,
		boolean system) {
		final Bundle extras = new Bundle();

+1 −10

Original line number	Diff line number	Diff line
		@@ -36,13 +36,11 @@ import com.android.systemui.util.NotificationChannels;

		import java.lang.reflect.Constructor;
		import java.lang.reflect.InvocationTargetException;
		import java.util.HashMap;
		import java.util.Map;

		/**
		* Application class for SystemUI.
		*/
		public class SystemUIApplication extends Application implements SysUiServiceProvider,
		public class SystemUIApplication extends Application implements
		SystemUIAppComponentFactory.ContextInitializer {

		public static final String TAG = "SystemUIService";
		@@ -56,7 +54,6 @@ public class SystemUIApplication extends Application implements SysUiServiceProv
		private SystemUI[] mServices;
		private boolean mServicesStarted;
		private boolean mBootCompleted;
		private final Map<Class<?>, Object> mComponents = new HashMap<>();
		private SystemUIAppComponentFactory.ContextAvailableCallback mContextAvailableCallback;

		public SystemUIApplication() {
		@@ -199,7 +196,6 @@ public class SystemUIApplication extends Application implements SysUiServiceProv
		throw new RuntimeException(ex);
		}

		mServices[i].mComponents = mComponents;
		if (DEBUG) Log.d(TAG, "running: " + mServices[i]);
		mServices[i].start();
		log.traceEnd();
		@@ -232,11 +228,6 @@ public class SystemUIApplication extends Application implements SysUiServiceProv
		}
		}

		@SuppressWarnings("unchecked")
		public <T> T getComponent(Class<T> interfaceType) {
		return (T) mComponents.get(interfaceType);
		}

		public SystemUI[] getServices() {
		return mServices;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.widget.Toast;

		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.SysUiServiceProvider;
		import com.android.systemui.shared.recents.IOverviewProxy;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.stackdivider.Divider;
		@@ -73,7 +72,7 @@ public class OverviewProxyRecentsImpl implements RecentsImplementation {
		}

		@Override
		public void onStart(Context context, SysUiServiceProvider sysUiServiceProvider) {
		public void onStart(Context context) {
		mContext = context;
		mHandler = new Handler();
		mTrustManager = (TrustManager) context.getSystemService(Context.TRUST_SERVICE);