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

Commit 4b3da8ca authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Set DigitalWellBeingToast to GONE when there is no limit" into main

parents 255bb6a8 98484db4

quickstep/res/layout/digital_wellbeing_toast.xml

+2 −1
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@ 
    android:textColor="?attr/materialColorOnSecondaryFixed"

    android:textSize="14sp"

    android:autoSizeTextType="uniform"

    android:autoSizeMaxTextSize="14sp"/>
 
 No newline at end of file
 
    android:autoSizeMaxTextSize="14sp"

    android:visibility="gone"/>
 
 No newline at end of file

quickstep/res/layout/task.xml

+1 −2
Original line number Diff line number Diff line
@@ -49,6 +49,5 @@ 
        android:layout_width="wrap_content" />



    <include layout="@layout/digital_wellbeing_toast"

        android:id="@+id/digital_wellbeing_toast"

        android:visibility="invisible"/>

        android:id="@+id/digital_wellbeing_toast"/>

</com.android.quickstep.views.TaskView>
 
 No newline at end of file

quickstep/res/layout/task_grouped.xml

+2 −4
Original line number Diff line number Diff line
@@ -75,10 +75,8 @@ 
        android:layout_width="wrap_content" />



    <include layout="@layout/digital_wellbeing_toast"

        android:id="@+id/digital_wellbeing_toast"

        android:visibility="invisible"/>

        android:id="@+id/digital_wellbeing_toast"/>



    <include layout="@layout/digital_wellbeing_toast"

        android:id="@+id/bottomRight_digital_wellbeing_toast"

        android:visibility="invisible"/>

        android:id="@+id/bottomRight_digital_wellbeing_toast"/>

</com.android.quickstep.views.GroupedTaskView>
 
 No newline at end of file

quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt

+7 −6
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import androidx.annotation.StringRes 
import androidx.annotation.VisibleForTesting

import androidx.core.util.component1

import androidx.core.util.component2

import androidx.core.view.isVisible

import com.android.launcher3.R

import com.android.launcher3.Utilities

import com.android.launcher3.util.Executors
@@ -108,18 +109,18 @@ constructor( 
    }



    private fun setNoLimit() {

        isVisible = false

        hasLimit = false

        setContentDescription(appUsageLimitTimeMs = -1, appRemainingTimeMs = -1)

        visibility = INVISIBLE

        appRemainingTimeMs = -1

        setContentDescription(appUsageLimitTimeMs = -1, appRemainingTimeMs = -1)

    }



    private fun setLimit(appUsageLimitTimeMs: Long, appRemainingTimeMs: Long) {

        this.appRemainingTimeMs = appRemainingTimeMs

        isVisible = true

        hasLimit = true

        text = Utilities.prefixTextWithIcon(context, R.drawable.ic_hourglass_top, getBannerText())

        visibility = VISIBLE

        this.appRemainingTimeMs = appRemainingTimeMs

        setContentDescription(appUsageLimitTimeMs, appRemainingTimeMs)

        text = Utilities.prefixTextWithIcon(context, R.drawable.ic_hourglass_top, getBannerText())

    }



    private fun setContentDescription(appUsageLimitTimeMs: Long, appRemainingTimeMs: Long) {
@@ -172,7 +173,7 @@ constructor( 


    /** Mark the DWB toast as destroyed and hide it. */

    fun destroy() {

        visibility = INVISIBLE

        isVisible = false

        isDestroyed = true

    }

quickstep/src/com/android/quickstep/views/TaskContainer.kt

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ class TaskContainer( 
        addAccessibleChildToList(iconView.asView(), outChildren)

        addAccessibleChildToList(snapshotView, outChildren)

        showWindowsView?.let { addAccessibleChildToList(it, outChildren) }

        digitalWellBeingToast?.let { addAccessibleChildToList(it, outChildren) }

    }



    private fun addAccessibleChildToList(view: View, outChildren: ArrayList<View>) {