commit d71f2b3f1ac3abfff211f1214ef1b83abb696190
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 19 11:58:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 19 11:58:13 2020 +0000
tree aaedfb737793f82b930e369312c6b660689b57dd
parent 6622ff7181b6079f40f40b6523cf47bcc8053c0d
parent c39b3dfd7648e5b6df41fbf75892c538eb109ea6

Merge "Preserve icon for "manage space"" am: c39b3dfd76

Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487

src/com/android/settings/applications/AppStorageSettings.java

diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index b0c3b65..3cded6a 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -311,11 +311,10 @@
             if (appHasSpaceManagementUI) {
                 mButtonsPref.setButton1Text(R.string.manage_space_text);
             } else {
-                mButtonsPref
-                        .setButton1Text(R.string.clear_user_data_text)
-                        .setButton1Icon(R.drawable.ic_settings_delete);
+                mButtonsPref.setButton1Text(R.string.clear_user_data_text);
             }
-            mButtonsPref.setButton1OnClickListener(v -> handleClearDataClick());
+            mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
+                    .setButton1OnClickListener(v -> handleClearDataClick());
         }
 
         if (mAppsControlDisallowedBySystem) {