Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Smartspace - Next alarm

Browse Source 
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
This commit is contained in:
Matt Pietal
2021-05-07 08:24:01 -04:00
parent e28295bb22
commit bf934d2201
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import android.app.PendingIntent;
import android.app.smartspace.SmartspaceAction;
import android.app.smartspace.SmartspaceTarget;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
import android.view.View;
import android.view.ViewGroup;
@@ -93,9 +93,14 @@ public interface BcSmartspaceDataPlugin extends Plugin {
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 */

6
packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java
View File

@@ -32,7 +32,7 @@ import android.app.smartspace.SmartspaceTarget;
import android.content.Context;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.drawable.Icon;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.UserHandle;
import android.test.suitebuilder.annotation.SmallTest;
@@ -394,6 +394,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase {
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) { }
}
}