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

Commit bf934d22 authored by Matt Pietal's avatar Matt Pietal
Browse files

Smartspace - Next alarm 

Support next alarm appearing next to DnD. If weather is showing, show
inline, otherwise below the smartspace content. Next alarm will not
fade out but DnD will.

Fixes: 185678563
Test: atest KeyguardZenAlarmViewControllerTest

Change-Id: I21e95470d0013bfb6900c1c228dda69f5707c9e6
parent e28295bb

packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java

+8 −3
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ import android.app.PendingIntent; 
import android.app.smartspace.SmartspaceAction;

import android.app.smartspace.SmartspaceAction;

import android.app.smartspace.SmartspaceTarget;

import android.app.smartspace.SmartspaceTarget;

import android.content.Intent;

import android.content.Intent;

import android.graphics.drawable.Icon;

import android.graphics.drawable.Drawable;

import android.os.Parcelable;

import android.os.Parcelable;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;
@@ -93,9 +93,14 @@ public interface BcSmartspaceDataPlugin extends Plugin { 
        void setFalsingManager(com.android.systemui.plugins.FalsingManager falsingManager);

        void setFalsingManager(com.android.systemui.plugins.FalsingManager falsingManager);





        /**

        /**

         * Set or clear any Do Not Disturb information.

         * Set or clear Do Not Disturb information.

         */

         */

        void setDnd(@Nullable Icon dndIcon, @Nullable String description);

        void setDnd(@Nullable Drawable image, @Nullable String description);



        /**

         * Set or clear next alarm information

         */

        void setNextAlarm(@Nullable Drawable image, @Nullable String description);

    }

    }





    /** Interface for launching Intents, which can differ on the lockscreen */

    /** Interface for launching Intents, which can differ on the lockscreen */

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ import android.app.smartspace.SmartspaceTarget; 
import android.content.Context;

import android.content.Context;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.drawable.Icon;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.os.Handler;

import android.os.UserHandle;

import android.os.UserHandle;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;
@@ -394,6 +394,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase { 




        public void setFalsingManager(FalsingManager falsingManager) { }

        public void setFalsingManager(FalsingManager falsingManager) { }





        public void setDnd(@Nullable Icon dndIcon, @Nullable String description) { }

        public void setDnd(@Nullable Drawable dndIcon, @Nullable String description) { }



        public void setNextAlarm(@Nullable Drawable dndIcon, @Nullable String description) { }

    }

    }

}
 
}