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

Commit e921bacf authored by vadimt's avatar vadimt
Browse files

Removing hourglass_bottom 

Now that we don't show DWB toast for negative remaining time

Bug: 127689526
Change-Id: I3ced3ec0da9bd7b09df9b66b4ef608e87339573f
parent 8dc1dbe8

quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ public final class DigitalWellBeingToast extends LinearLayout { 
    private static final String TAG = DigitalWellBeingToast.class.getSimpleName();

    private static final String TAG = DigitalWellBeingToast.class.getSimpleName();





    private Task mTask;

    private Task mTask;

    private ImageView mImage;

    private TextView mText;

    private TextView mText;





    public DigitalWellBeingToast(Context context, AttributeSet attrs) {

    public DigitalWellBeingToast(Context context, AttributeSet attrs) {
@@ -75,7 +74,6 @@ public final class DigitalWellBeingToast extends LinearLayout { 
        super.onFinishInflate();

        super.onFinishInflate();





        mText = findViewById(R.id.digital_well_being_remaining_time);

        mText = findViewById(R.id.digital_well_being_remaining_time);

        mImage = findViewById(R.id.digital_well_being_hourglass);

    }

    }





    public void initialize(Task task, InitializeCallback callback) {

    public void initialize(Task task, InitializeCallback callback) {
@@ -103,8 +101,6 @@ public final class DigitalWellBeingToast extends LinearLayout { 
                } else {

                } else {

                    setVisibility(VISIBLE);

                    setVisibility(VISIBLE);

                    mText.setText(getText(appRemainingTimeMs));

                    mText.setText(getText(appRemainingTimeMs));

                    mImage.setImageResource(appRemainingTimeMs > 0 ?

                            R.drawable.hourglass_top : R.drawable.hourglass_bottom);

                }

                }





                callback.call(getContentDescriptionForTask(

                callback.call(getContentDescriptionForTask(

quickstep/res/drawable/hourglass_bottom.xml

deleted100644 → 0
+0 −12
Original line number Original line Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <group>

        <clip-path android:pathData="M0,0H24V24H0Z M 0,0"/>

        <path

            android:fillColor="#FFFFFFFF"

            android:pathData="M6,2V8H6l4,4L6,16H6v6H18V16h0l-4,-4,4,-4h0V2Zm6,9.5,-4,-4V4h8V7.5Z"/>

    </group>

</vector>

quickstep/res/layout/task.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ 
            android:layout_width="24dp"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_height="24dp"

            android:layout_marginEnd="8dp"

            android:layout_marginEnd="8dp"

            android:src="@drawable/ic_hourglass_top"

        />

        />

        <TextView

        <TextView

            android:id="@+id/digital_well_being_remaining_time"

            android:id="@+id/digital_well_being_remaining_time"