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

Commit 182ce217 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "New modules for DI, utils, settings, and retail" into main

parents 2466f2d2 36d5a0ac

packages/SystemUI/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -497,6 +497,9 @@ android_library { 
    resource_dirs: [],

    static_libs: [

        "//frameworks/libs/systemui:compilelib",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/util/settings:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:impl",

        "SystemUI-res",

        "WifiTrackerLib",

        "WindowManager-Shell",
@@ -770,6 +773,9 @@ android_library { 
    ],

    static_libs: [

        "//frameworks/libs/systemui:compilelib",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/util/settings:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:impl",

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

packages/SystemUI/common/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -30,5 +30,9 @@ java_library { 
        "src/**/*.kt",

    ],



    static_libs: ["SystemUI-shared-utils"],



    libs: ["//frameworks/libs/systemui:tracinglib-platform"],



    kotlincflags: ["-Xjvm-default=all"],

}

packages/SystemUI/src/com/android/systemui/common/coroutine/ConflatedCallbackFlow.kt→packages/SystemUI/common/src/com/android/systemui/common/coroutine/ConflatedCallbackFlow.kt

+0 −0

File moved.

View file

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSFooterViewControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import com.android.systemui.plugins.ActivityStarter; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;

import com.android.systemui.retail.data.repository.FakeRetailModeRepository;

import com.android.systemui.retail.domain.interactor.RetailModeInteractorImpl;

import com.android.systemui.retail.domain.interactor.impl.RetailModeInteractorImpl;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.utils.leaks.LeakCheckedTest;