diff --git a/res/xml/automatic_storage_management_settings.xml b/res/xml/automatic_storage_management_settings.xml index 1428741e8cf..0c9e9b5956f 100644 --- a/res/xml/automatic_storage_management_settings.xml +++ b/res/xml/automatic_storage_management_settings.xml @@ -23,13 +23,12 @@ android:summary="%s" android:title="@string/automatic_storage_manager_days_title" android:entries="@array/automatic_storage_management_days" - android:entryValues="@array/automatic_storage_management_days_values" - settings:allowDividerBelow="true" /> + android:entryValues="@array/automatic_storage_management_days_values" /> - + settings:searchable="false"/> \ No newline at end of file diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java index d11e68b64a4..4cd79495a7b 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java @@ -19,13 +19,13 @@ import android.provider.Settings; import android.text.format.DateUtils; import android.text.format.Formatter; -import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.widget.FooterPreference; /** * Handles the wall of text which appears below the options in the Storage Management settings drill @@ -51,7 +51,7 @@ public class AutomaticStorageManagerDescriptionPreferenceController @Override public void displayPreference(PreferenceScreen screen) { - Preference preference = screen.findPreference(getPreferenceKey()); + final FooterPreference preference = screen.findPreference(getPreferenceKey()); final Context context = preference.getContext(); ContentResolver cr = context.getContentResolver(); long freedBytes = diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index 19ecc5444d1..dbdbf38cee3 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -7,10 +7,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settingslib.widget.FooterPreference; import org.junit.Before; import org.junit.Ignore; @@ -28,7 +28,7 @@ public class AutomaticStorageManagerDescriptionPreferenceControllerTest { @Mock private PreferenceScreen mScreen; @Mock - private Preference mPreference; + private FooterPreference mPreference; private AutomaticStorageManagerDescriptionPreferenceController mController; private Context mContext = RuntimeEnvironment.application;