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

Commit e0d9fb99 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change default intent for AlarmTile" into sc-qpr1-dev am: 2cbc502f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15881683

Change-Id: I4051043fe0236cf024bd3117623cf9fccc6b1e5c
parents 99007bca 2cbc502f

packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class AlarmTile @Inject constructor( 
    private var lastAlarmInfo: AlarmManager.AlarmClockInfo? = null

    private val icon = ResourceIcon.get(R.drawable.ic_alarm)

    @VisibleForTesting

    internal val defaultIntent = Intent(AlarmClock.ACTION_SET_ALARM)

    internal val defaultIntent = Intent(AlarmClock.ACTION_SHOW_ALARMS)

    private val callback = NextAlarmController.NextAlarmChangeCallback { nextAlarm ->

        lastAlarmInfo = nextAlarm

        refreshState()

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/AlarmTileTest.kt

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package com.android.systemui.qs.tiles 
import android.app.AlarmManager

import android.app.PendingIntent

import android.os.Handler

import android.provider.AlarmClock

import android.service.quicksettings.Tile

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper
@@ -97,6 +98,11 @@ class AlarmTileTest : SysuiTestCase() { 
        assertThat(tile.state.handlesLongClick).isFalse()

    }



    @Test

    fun testDefaultIntentShowAlarms() {

        assertThat(tile.defaultIntent.action).isEqualTo(AlarmClock.ACTION_SHOW_ALARMS)

    }



    @Test

    fun testInactiveByDefault() {

        assertThat(tile.state.state).isEqualTo(Tile.STATE_INACTIVE)