diff options
| author | vadimt <vadimt@google.com> | 2019-04-12 11:10:20 -0700 |
|---|---|---|
| committer | Vadim Tryshev <vadimt@google.com> | 2019-04-12 19:27:17 +0000 |
| commit | c6d9ddfddbc70aa1f486b3ed730111741566989f (patch) | |
| tree | 90b5f14768cdf3acfdfa79e5e8a186980cf80b9e | |
| parent | ab472e8c0619309c051d6a584aa43d4937203316 (diff) | |
| download | android_packages_apps_Trebuchet-c6d9ddfddbc70aa1f486b3ed730111741566989f.tar.gz android_packages_apps_Trebuchet-c6d9ddfddbc70aa1f486b3ed730111741566989f.tar.bz2 android_packages_apps_Trebuchet-c6d9ddfddbc70aa1f486b3ed730111741566989f.zip | |
Removing hourglass_bottom
Now that we don't show DWB toast for negative remaining time
Bug: 127689526
Change-Id: I3ced3ec0da9bd7b09df9b66b4ef608e87339573f
(cherry picked from commit e921bacfb8f8a5f594389d3d8e79eef58c25c139)
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java | 4 | ||||
| -rw-r--r-- | quickstep/res/drawable/hourglass_bottom.xml | 12 | ||||
| -rw-r--r-- | quickstep/res/drawable/ic_hourglass_top.xml (renamed from quickstep/res/drawable/hourglass_top.xml) | 0 | ||||
| -rw-r--r-- | quickstep/res/layout/task.xml | 1 |
4 files changed, 1 insertions, 16 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java index 446fb3905..b9791bfbc 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java @@ -59,7 +59,6 @@ public final class DigitalWellBeingToast extends LinearLayout { private static final String TAG = DigitalWellBeingToast.class.getSimpleName(); private Task mTask; - private ImageView mImage; private TextView mText; public DigitalWellBeingToast(Context context, AttributeSet attrs) { @@ -75,7 +74,6 @@ public final class DigitalWellBeingToast extends LinearLayout { super.onFinishInflate(); mText = findViewById(R.id.digital_well_being_remaining_time); - mImage = findViewById(R.id.digital_well_being_hourglass); } public void initialize(Task task, InitializeCallback callback) { @@ -103,8 +101,6 @@ public final class DigitalWellBeingToast extends LinearLayout { } else { setVisibility(VISIBLE); mText.setText(getText(appRemainingTimeMs)); - mImage.setImageResource(appRemainingTimeMs > 0 ? - R.drawable.hourglass_top : R.drawable.hourglass_bottom); } callback.call(getContentDescriptionForTask( diff --git a/quickstep/res/drawable/hourglass_bottom.xml b/quickstep/res/drawable/hourglass_bottom.xml deleted file mode 100644 index b5ef008d2..000000000 --- a/quickstep/res/drawable/hourglass_bottom.xml +++ /dev/null @@ -1,12 +0,0 @@ -<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> diff --git a/quickstep/res/drawable/hourglass_top.xml b/quickstep/res/drawable/ic_hourglass_top.xml index 7fc77d3fc..7fc77d3fc 100644 --- a/quickstep/res/drawable/hourglass_top.xml +++ b/quickstep/res/drawable/ic_hourglass_top.xml diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml index f96a66fc7..1d1c2723f 100644 --- a/quickstep/res/layout/task.xml +++ b/quickstep/res/layout/task.xml @@ -49,6 +49,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="8dp" + android:src="@drawable/ic_hourglass_top" /> <TextView android:id="@+id/digital_well_being_remaining_time" |