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

Commit ea4260c0 authored by Arc Wang's avatar Arc Wang
Browse files

Fix ManageStoragePreferenceController always consume click event 

ManageStoragePreferenceController should only consume click
event when its preference key matches the key of the clicked
preference.

Bug: 228970667
Test: atest ManageStoragePreferenceControllerTest
Change-Id: Ia6c62cf457fc4cadc27dc160dbd9b04ec3392d68
parent 3c354a2d

src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent; 
import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.text.TextUtils;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;
@@ -65,6 +66,10 @@ public class ManageStoragePreferenceController extends BasePreferenceController 


    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (!TextUtils.equals(getPreferenceKey(), preference.getKey())) {

            return super.handlePreferenceTreeClick(preference);

        }



        final MetricsFeatureProvider metricsFeatureProvider =

                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();

        metricsFeatureProvider.action(mContext, SettingsEnums.STORAGE_FREE_UP_SPACE_NOW);

tests/unit/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceControllerTest.java

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.deviceinfo.storage;



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.content.Context;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.widget.CardPreference;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

public class ManageStoragePreferenceControllerTest {



    private ManageStoragePreferenceController mController;

    private CardPreference mPreference;



    @Before

    public void setUp() {

        Context context = ApplicationProvider.getApplicationContext();

        mPreference = new CardPreference(context);

        mController = new ManageStoragePreferenceController(context, "free_up_space");

    }



    @Test

    public void handPreferenceTreeClick_keyMatched_consumeClickEvent() {

        mPreference.setKey(mController.getPreferenceKey());



        assertTrue(mController.handlePreferenceTreeClick(mPreference));

    }



    @Test

    public void handPreferenceTreeClick_keyNotMatched_notConsumeClickEvent() {

        mPreference.setKey("not_matched_key");



        assertFalse(mController.handlePreferenceTreeClick(mPreference));

    }

}