PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9

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

Change-Id: I7aa4104198b2210aad9b65cb5834ebc7eb0e2784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arc Wang
2022-04-20 01:17:52 +00:00
committed by Automerger Merge Worker
parent 952408cabe 96491e1ea9
commit f94760e74c
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceController.java
View File

@@ -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);

59
tests/unit/src/com/android/settings/deviceinfo/storage/ManageStoragePreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* 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));
}
}