Merge "[conflict] Merge "Merge "Add basic structure for keyboard backlight... (8415180e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyboard/PhysicalKeyboardCoreStartable.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.systemui.CoreStartable
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyboard.backlight.ui.KeyboardBacklightDialogCoordinator
		import javax.inject.Inject

		/** A [CoreStartable] that launches components interested in physical keyboard interaction. */
		@@ -28,11 +29,12 @@ import javax.inject.Inject
		class PhysicalKeyboardCoreStartable
		@Inject
		constructor(
		private val keyboardBacklightDialogCoordinator: KeyboardBacklightDialogCoordinator,
		private val featureFlags: FeatureFlags,
		) : CoreStartable {
		override fun start() {
		if (featureFlags.isEnabled(Flags.KEYBOARD_BACKLIGHT_INDICATOR)) {
		// TODO(b/268645743) start listening for keyboard backlight brightness
		keyboardBacklightDialogCoordinator.startListening()
		}
		}
		}

packages/SystemUI/src/com/android/systemui/keyboard/backlight/domain/interactor/KeyboardBacklightInteractor.kt

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.keyboard.backlight.domain.interactor

		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyboard.data.repository.KeyboardRepository
		import com.android.systemui.keyboard.shared.model.BacklightModel
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.flowOf

		/** Allows listening to changes to keyboard backlight level */
		@SysUISingleton
		class KeyboardBacklightInteractor
		@Inject
		constructor(
		private val keyboardRepository: KeyboardRepository,
		) {

		/** Emits current backlight level as [BacklightModel] or null if keyboard is not connected */
		val backlight: Flow<BacklightModel?> =
		keyboardRepository.keyboardConnected.flatMapLatest { connected ->
		if (connected) keyboardRepository.backlight else flowOf(null)
		}
		}

packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/KeyboardBacklightDialogCoordinator.kt

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.keyboard.backlight.ui

		import android.content.Context
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.keyboard.backlight.ui.view.KeyboardBacklightDialog
		import com.android.systemui.keyboard.backlight.ui.viewmodel.BacklightDialogViewModel
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.launch

		/**
		* Based on the state produced from [BacklightDialogViewModel] shows or hides keyboard backlight
		* indicator
		*/
		@SysUISingleton
		class KeyboardBacklightDialogCoordinator
		@Inject
		constructor(
		@Application private val applicationScope: CoroutineScope,
		private val context: Context,
		private val viewModel: BacklightDialogViewModel,
		) {

		var dialog: KeyboardBacklightDialog? = null

		fun startListening() {
		applicationScope.launch {
		viewModel.dialogContent.collect { dialogViewModel ->
		if (dialogViewModel != null) {
		if (dialog == null) {
		dialog = KeyboardBacklightDialog(context, dialogViewModel)
		// pass viewModel and show
		}
		} else {
		dialog?.dismiss()
		dialog = null
		}
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.keyboard.backlight.ui.view

		import android.app.Dialog
		import android.content.Context
		import android.os.Bundle
		import com.android.systemui.keyboard.backlight.ui.viewmodel.BacklightDialogContentViewModel

		class KeyboardBacklightDialog(context: Context, val viewModel: BacklightDialogContentViewModel) :
		Dialog(context) {

		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		// TODO(b/268650355) Implement the dialog
		}
		}

packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/viewmodel/BacklightDialogContentViewModel.kt

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.keyboard.backlight.ui.viewmodel

		data class BacklightDialogContentViewModel(val currentValue: Int, val maxValue: Int)