Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 873550b4 authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge changes from topics "shelf-refactor-anv", "shelf-refactor-click" into udc-dev am: 0948e76a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22575210



Change-Id: I11d6dd2eb8bbc0947722908fd4a00b596ad0f103
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25fe1d06 0948e76a

packages/SystemUI/src/com/android/systemui/accessibility/data/repository/AccessibilityRepository.kt

0 → 100644
+55 −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.accessibility.data.repository



import android.view.accessibility.AccessibilityManager

import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import dagger.Module

import dagger.Provides

import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.distinctUntilChanged



/** Exposes accessibility-related state. */

interface AccessibilityRepository {

    /** @see [AccessibilityManager.isTouchExplorationEnabled] */

    val isTouchExplorationEnabled: Flow<Boolean>



    companion object {

        operator fun invoke(a11yManager: AccessibilityManager): AccessibilityRepository =

            AccessibilityRepositoryImpl(a11yManager)

    }

}



private class AccessibilityRepositoryImpl(

    manager: AccessibilityManager,

) : AccessibilityRepository {

    override val isTouchExplorationEnabled: Flow<Boolean> =

        conflatedCallbackFlow {

                val listener = TouchExplorationStateChangeListener(::trySend)

                manager.addTouchExplorationStateChangeListener(listener)

                trySend(manager.isTouchExplorationEnabled)

                awaitClose { manager.removeTouchExplorationStateChangeListener(listener) }

            }

            .distinctUntilChanged()

}



@Module

object AccessibilityRepositoryModule {

    @Provides fun provideRepo(manager: AccessibilityManager) = AccessibilityRepository(manager)

}

packages/SystemUI/src/com/android/systemui/accessibility/domain/interactor/AccessibilityInteractor.kt

0 → 100644
+33 −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.accessibility.domain.interactor



import com.android.systemui.accessibility.data.repository.AccessibilityRepository

import com.android.systemui.dagger.SysUISingleton

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow



@SysUISingleton

class AccessibilityInteractor

@Inject

constructor(

    private val a11yRepo: AccessibilityRepository,

) {

    /** @see [android.view.accessibility.AccessibilityManager.isTouchExplorationEnabled] */

    val isTouchExplorationEnabled: Flow<Boolean>

        get() = a11yRepo.isTouchExplorationEnabled

}

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollector.java

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ public interface FalsingCollector { 
    /** */

    void onSuccessfulUnlock();



    /** */

    void onNotificationActive();



    /** */

    void setShowingAod(boolean showingAod);

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorFake.java

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ public class FalsingCollectorFake implements FalsingCollector { 
    public void onSuccessfulUnlock() {

    }



    @Override

    public void onNotificationActive() {

    }



    @Override

    public void setShowingAod(boolean showingAod) {

    }

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java

+0 −4
Original line number Diff line number Diff line
@@ -173,10 +173,6 @@ class FalsingCollectorImpl implements FalsingCollector { 
        sessionEnd();

    }



    @Override

    public void onNotificationActive() {

    }



    @Override

    public void setShowingAod(boolean showingAod) {

        mShowingAod = showingAod;