Create Builder for NightDisplayListener (2c23e79c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.app.INotificationManager;
		import android.content.Context;
		import android.content.SharedPreferences;
		import android.hardware.display.AmbientDisplayConfiguration;
		import android.hardware.display.NightDisplayListener;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.Looper;
		@@ -78,7 +77,7 @@ import dagger.Provides;
		*
		* See SystemUI/docs/dagger.md
		*/
		@Module
		@Module(includes = {NightDisplayListenerModule.class})
		public class DependencyProvider {

		@Singleton
		@@ -151,13 +150,6 @@ public class DependencyProvider {
		return new MetricsLogger();
		}

		@Singleton
		@Provides
		public NightDisplayListener provideNightDisplayListener(Context context,
		@Background Handler bgHandler) {
		return new NightDisplayListener(context, bgHandler);
		}

		@Singleton
		@Provides
		public PluginManager providePluginManager(Context context) {

packages/SystemUI/src/com/android/systemui/dagger/NightDisplayListenerModule.java

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.dagger;

		import android.content.Context;
		import android.hardware.display.NightDisplayListener;
		import android.os.Handler;
		import android.os.UserHandle;

		import com.android.systemui.dagger.qualifiers.Background;

		import javax.inject.Inject;

		import dagger.Module;
		import dagger.Provides;

		/**
		* Module for providing a {@link NightDisplayListener}.
		*/
		@Module
		public class NightDisplayListenerModule {

		/**
		* Provides a {@link NightDisplayListener}.
		*
		* The provided listener is associated with the user as returned by
		* {@link android.app.ActivityManager#getCurrentUser}, making an IPC call on its creation.
		* If the current user is known, prefer using a {@link Builder}.
		*/
		@Provides
		public NightDisplayListener provideNightDisplayListener(Context context,
		@Background Handler bgHandler) {
		return new NightDisplayListener(context, bgHandler);
		}

		/**
		* Builder to create instances of {@link NightDisplayListener}.
		*
		* It uses {@link UserHandle#USER_SYSTEM} as the default user.
		*/
		public static class Builder {
		private final Context mContext;
		private final Handler mBgHandler;
		private int mUserId = UserHandle.USER_SYSTEM;

		@Inject
		public Builder(Context context, @Background Handler bgHandler) {
		mContext = context;
		mBgHandler = bgHandler;
		}

		/**
		* Set the userId for this builder
		*/
		public Builder setUser(int userId) {
		mUserId = userId;
		return this;
		}

		/**
		* Build a {@link NightDisplayListener} for the set user.
		*/
		public NightDisplayListener build() {
		return new NightDisplayListener(mContext, mUserId, mBgHandler);
		}
		}
		}

packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import androidx.annotation.StringRes;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.systemui.R;
		import com.android.systemui.dagger.NightDisplayListenerModule;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.plugins.ActivityStarter;
		@@ -68,6 +69,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> implements

		private final ColorDisplayManager mManager;
		private final LocationController mLocationController;
		private final NightDisplayListenerModule.Builder mNightDisplayListenerBuilder;
		private NightDisplayListener mListener;
		private boolean mIsListening;

		@@ -81,13 +83,15 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> implements
		ActivityStarter activityStarter,
		QSLogger qsLogger,
		LocationController locationController,
		ColorDisplayManager colorDisplayManager
		ColorDisplayManager colorDisplayManager,
		NightDisplayListenerModule.Builder nightDisplayListenerBuilder
		) {
		super(host, backgroundLooper, mainHandler, metricsLogger, statusBarStateController,
		activityStarter, qsLogger);
		mLocationController = locationController;
		mManager = colorDisplayManager;
		mListener = new NightDisplayListener(mContext, mainHandler);
		mNightDisplayListenerBuilder = nightDisplayListenerBuilder;
		mListener = mNightDisplayListenerBuilder.setUser(host.getUserContext().getUserId()).build();
		}

		@Override
		@@ -123,7 +127,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> implements
		}

		// Make a new controller for the new user.
		mListener = new NightDisplayListener(mContext, newUserId, new Handler(Looper.myLooper()));
		mListener = mNightDisplayListenerBuilder.setUser(newUserId).build();
		if (mIsListening) {
		mListener.setCallback(this);
		}