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

Commit 2c4337ac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply footer icon for Smart Storage" into sc-dev am: f38af988 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69ff3b23eae88be9b159a81de3ba62076fba8281
parents 1b604e33 f38af988

res/xml/automatic_storage_management_settings.xml

+3 −4
Original line number Diff line number Diff line
@@ -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" />



        <Preference

        <com.android.settingslib.widget.FooterPreference

            android:key="freed_bytes"

            android:persistent="false"

            android:selectable="false"

            settings:allowDividerAbove="true" />

            settings:searchable="false"/>



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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 =

tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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;