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

Commit 2e63a3e1 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Fix LowLightClockDreamService's package." into main

parents 0ba3137a 23c665b2

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ 
            />



        <service

            android:name="com.google.android.systemui.lowlightclock.LowLightClockDreamService"

            android:name=".lowlightclock.LowLightClockDreamService"

            android:enabled="false"

            android:exported="false"

            android:directBootAware="true"

packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java

+7 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.systemui.dreams.homecontrols.HomeControlsDreamService; 
import com.android.systemui.dreams.homecontrols.dagger.HomeControlsDataSourceModule;

import com.android.systemui.dreams.homecontrols.dagger.HomeControlsRemoteServiceComponent;

import com.android.systemui.dreams.homecontrols.system.HomeControlsRemoteService;

import com.android.systemui.lowlightclock.LowLightClockDreamService;

import com.android.systemui.qs.QsEventLogger;

import com.android.systemui.qs.pipeline.shared.TileSpec;

import com.android.systemui.qs.shared.model.TileCategory;
@@ -49,8 +50,6 @@ import com.android.systemui.qs.tiles.base.shared.model.QSTileUIConfig; 
import com.android.systemui.res.R;

import com.android.systemui.touch.TouchInsetManager;



import com.google.android.systemui.lowlightclock.LowLightClockDreamService;



import dagger.Binds;

import dagger.BindsOptionalOf;

import dagger.Module;
@@ -250,6 +249,12 @@ public interface DreamModule { 
        return new ComponentName(context, LowLightClockDreamService.class);

    }



    /** Inject into LowLightClockDreamService. */

    @Binds

    @IntoMap

    @ClassKey(LowLightClockDreamService.class)

    Service bindLowLightClockDreamService(LowLightClockDreamService service);



    /**

     * Provides the component name of the low light dream, or null if not configured.

     */

packages/SystemUI/src/com/google/android/systemui/lowlightclock/LowLightClockDreamService.java→packages/SystemUI/src/com/android/systemui/lowlightclock/LowLightClockDreamService.java

+2 −5
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.google.android.systemui.lowlightclock;

package com.android.systemui.lowlightclock;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -28,9 +28,6 @@ import android.widget.TextView; 


import com.android.dream.lowlight.LowLightTransitionCoordinator;

import com.android.systemui.Flags;

import com.android.systemui.lowlightclock.ChargingStatusProvider;

import com.android.systemui.lowlightclock.LowLightClockAnimationProvider;

import com.android.systemui.lowlightclock.LowLightDisplayController;

import com.android.systemui.res.R;



import java.util.Optional;

packages/SystemUI/tests/src/com/android/systemui/lowlightclock/LowLightClockDreamServiceTest.java

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ import androidx.test.filters.SmallTest; 
import com.android.dream.lowlight.LowLightTransitionCoordinator;

import com.android.systemui.SysuiTestCase;



import com.google.android.systemui.lowlightclock.LowLightClockDreamService;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;