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

Commit 76eb4019 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused StorageSlice"

parents 60d3e5ec 1406e182

src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.homepage.contextualcards.deviceinfo;



import android.app.PendingIntent;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.os.storage.StorageManager;

import android.text.format.Formatter;



import androidx.core.graphics.drawable.IconCompat;

import androidx.slice.Slice;

import androidx.slice.builders.ListBuilder;

import androidx.slice.builders.SliceAction;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.SubSettings;

import com.android.settings.Utils;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.CustomSliceable;

import com.android.settings.slices.SliceBuilderUtils;

import com.android.settingslib.deviceinfo.PrivateStorageInfo;

import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;



public class StorageSlice implements CustomSliceable {

    private static final String TAG = "StorageSlice";



    private final Context mContext;



    public StorageSlice(Context context) {

        mContext = context;

    }



    @Override

    public Uri getUri() {

        return CustomSliceRegistry.STORAGE_SLICE_URI;

    }



    @Override

    public Slice getSlice() {

        final IconCompat icon = IconCompat.createWithResource(mContext,

                R.drawable.ic_homepage_storage);

        final String title = mContext.getString(R.string.storage_label);

        final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,

                ListBuilder.ICON_IMAGE, title);

        final PrivateStorageInfo info = getPrivateStorageInfo();

        return new ListBuilder(mContext, CustomSliceRegistry.STORAGE_SLICE_URI,

                ListBuilder.INFINITY)

                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))

                .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))

                .addRow(new ListBuilder.RowBuilder()

                        .setTitle(getStorageUsedText(info))

                        .setSubtitle(getStorageSummaryText(info))

                        .setPrimaryAction(primaryAction))

                .build();

    }



    @Override

    public Intent getIntent() {

        final String screenTitle = mContext.getText(R.string.storage_label).toString();

        return SliceBuilderUtils.buildSearchResultPageIntent(mContext,

                StorageDashboardFragment.class.getName(), "" /* key */, screenTitle,

                SettingsEnums.SLICE)

                .setClassName(mContext.getPackageName(), SubSettings.class.getName())

                .setData(CustomSliceRegistry.STORAGE_SLICE_URI);

    }



    private PendingIntent getPrimaryAction() {

        final Intent intent = getIntent();

        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent, 0  /* flags */);

    }



    @VisibleForTesting

    PrivateStorageInfo getPrivateStorageInfo() {

        final StorageManager storageManager = mContext.getSystemService(StorageManager.class);

        final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(storageManager);

        return PrivateStorageInfo.getPrivateStorageInfo(smvp);

    }



    @VisibleForTesting

    CharSequence getStorageUsedText(PrivateStorageInfo info) {

        final long usedBytes = info.totalBytes - info.freeBytes;

        return StorageSummaryDonutPreferenceController.convertUsedBytesToFormattedText(mContext,

                usedBytes);

    }



    @VisibleForTesting

    CharSequence getStorageSummaryText(PrivateStorageInfo info) {

        return mContext.getString(R.string.storage_volume_total,

                Formatter.formatShortFileSize(mContext, info.totalBytes));

    }



    @Override

    public void onNotifyChange(Intent intent) {



    }

}

src/com/android/settings/slices/CustomSliceRegistry.java

+0 −11
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.settings.display.AlwaysOnDisplaySlice; 
import com.android.settings.display.ScreenTimeoutPreferenceController;

import com.android.settings.flashlight.FlashlightSlice;

import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;

import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;

import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice;

import com.android.settings.homepage.contextualcards.slices.BluetoothDevicesSlice;

import com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice;
@@ -169,15 +168,6 @@ public class CustomSliceRegistry { 
            .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_ACTION)

            .appendPath("mobile_data")

            .build();

    /**

     * Backing Uri for the storage slice.

     */

    public static final Uri STORAGE_SLICE_URI = new Uri.Builder()

            .scheme(ContentResolver.SCHEME_CONTENT)

            .authority(SettingsSliceProvider.SLICE_AUTHORITY)

            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)

            .appendPath("storage_card")

            .build();

    /**

     * Full {@link Uri} for the Alarm volume Slice.

     */
@@ -341,7 +331,6 @@ public class CustomSliceRegistry { 
        sUriToSlice.put(MEDIA_OUTPUT_INDICATOR_SLICE_URI, MediaOutputIndicatorSlice.class);

        sUriToSlice.put(MEDIA_OUTPUT_SLICE_URI, MediaOutputSlice.class);

        sUriToSlice.put(MOBILE_DATA_SLICE_URI, MobileDataSlice.class);

        sUriToSlice.put(STORAGE_SLICE_URI, StorageSlice.class);

        sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class);

        sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class);

        sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class);

tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java

deleted100644 → 0
+0 −78
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.homepage.contextualcards.deviceinfo;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;



import android.content.Context;



import androidx.core.graphics.drawable.IconCompat;

import androidx.slice.Slice;

import androidx.slice.SliceMetadata;

import androidx.slice.SliceProvider;

import androidx.slice.core.SliceAction;

import androidx.slice.widget.SliceLiveData;



import com.android.settings.R;

import com.android.settingslib.deviceinfo.PrivateStorageInfo;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class StorageSliceTest {

    private static final String USED_BYTES_TEXT = "test used bytes";

    private static final String SUMMARY_TEXT = "test summary";



    private Context mContext;

    private StorageSlice mStorageSlice;



    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;



        // Set-up specs for SliceMetadata.

        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);



        mStorageSlice = spy(new StorageSlice(mContext));

    }



    @Test

    public void getSlice_shouldBeCorrectSliceContent() {

        final PrivateStorageInfo info = new PrivateStorageInfo(100L, 600L);

        doReturn(info).when(mStorageSlice).getPrivateStorageInfo();

        doReturn(USED_BYTES_TEXT).when(mStorageSlice).getStorageUsedText(any());

        doReturn(SUMMARY_TEXT).when(mStorageSlice).getStorageSummaryText(any());



        final Slice slice = mStorageSlice.getSlice();



        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);

        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.storage_label));



        final SliceAction primaryAction = metadata.getPrimaryAction();

        final IconCompat expectedIcon = IconCompat.createWithResource(mContext,

                R.drawable.ic_homepage_storage);

        assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());

    }

}