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

Commit b9176fe2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

Revert^2 "[Pod] Move SystemClock to util.time pod." 

This reverts commit ae49d748.

This moves the interface and the implementation and also moves the
Dagger that binds the two together.

Bug: 307607958
Flag: EXEMPT refactor
Test: m SystemUI
Test: m SystemUIComposeGalleryLib

Reason for revert: CL topic has build fix

Change-Id: I0b0fe5697342bfb69659789f3f31ca2343d9ac2d
parent ae49d748

packages/SystemUI/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ java_library { 
    name: "SystemUI-tests-concurrency",

    srcs: [

        "src/com/android/systemui/util/concurrency/DelayableExecutor.java",

        "src/com/android/systemui/util/time/SystemClock.java",

        "pods/com/android/systemui/util/time/SystemClock.java",

        "tests/utils/src/com/android/systemui/util/concurrency/FakeExecutor.java",

        "tests/utils/src/com/android/systemui/util/time/FakeSystemClock.java",

    ],
@@ -788,9 +788,7 @@ android_library { 
    ],

    static_libs: [

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

        "com.android.systemui.dagger-api",

        "com.android.systemui.util.settings-api",

        "com.android.systemui.retail-impl",

        "com.android.systemui.pods-aosp-handheld",

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

packages/SystemUI/pods/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ java_library { 
        "com.android.systemui.dagger-api",

        "com.android.systemui.retail-impl",

        "com.android.systemui.util.settings-api",

        "com.android.systemui.util.time-api",

        "com.android.systemui.util.time-impl",



    ],

    visibility: ["//frameworks/base/packages/SystemUI:__pkg__"],

}

packages/SystemUI/pods/com/android/systemui/util/time/Android.bp

0 → 100644
+48 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2025 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 {

    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



java_library {

    name: "com.android.systemui.util.time-api",

    srcs: [

        "*.java",

        "*.kt",

    ],

    defaults: [

        "SystemUI_pod_defaults_api",

    ],

}



java_library {

    name: "com.android.systemui.util.time-impl",

    srcs: [

        "impl/*.java",

        "impl/*.kt",

    ],

    libs: [

        "com.android.systemui.dagger-api",

        "dagger2",

    ],

    static_libs: [

        "com.android.systemui.util.time-api",

    ],

    defaults: [

        "SystemUI_pod_defaults_impl",

    ],

}

packages/SystemUI/src/com/android/systemui/util/time/SystemClockImpl.java→packages/SystemUI/pods/com/android/systemui/util/time/impl/SystemClockImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
 * limitations under the License.

 */



package com.android.systemui.util.time;

package com.android.systemui.util.time.impl;



import com.android.systemui.util.time.SystemClock;



import javax.inject.Inject;