From 38c857bd60e92c60eb656a4ce2f91e6d71dda9a3 Mon Sep 17 00:00:00 2001 From: pastychang Date: Wed, 1 Sep 2021 14:34:25 +0800 Subject: [PATCH 1/3] Fixed WiFi dialog force closed when physical window size is changed. When window size is changed, dialog should not be dismissed on the destroy. It will cause dialog to be shown from on create and then dismissed from on the destroy right away. Bug: 190573335 Test: manual Change-Id: I995c3cbf90a9ec3c5305ef57e655b0b0eb7cf5cc --- src/com/android/settings/wifi/WifiDialogActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 4514b0d19f0..56ecde494a8 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -197,13 +197,11 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog public void onDestroy() { if (mIsWifiTrackerLib) { if (mDialog2 != null && mDialog2.isShowing()) { - mDialog2.dismiss(); mDialog2 = null; } mWorkerThread.quit(); } else { if (mDialog != null && mDialog.isShowing()) { - mDialog.dismiss(); mDialog = null; } } From 0a03758738ef647ef5f32660d302b35502915582 Mon Sep 17 00:00:00 2001 From: ykhung Date: Wed, 1 Sep 2021 18:01:50 +0800 Subject: [PATCH 2/3] Move legacy hide applications in usage screen list to SettingsGoogle Bug: 195306545 Test: make SettingsRoboTests Change-Id: Iccb3530c40bc32c20d74d65aa3f26eb2d6719106 --- res/values/arrays.xml | 6 ------ .../fuelgauge/BatteryChartPreferenceController.java | 6 ++++-- .../android/settings/fuelgauge/ConvertUtils.java | 4 ++-- .../fuelgauge/PowerUsageFeatureProvider.java | 11 ++++++++--- .../fuelgauge/PowerUsageFeatureProviderImpl.java | 13 +++++++++---- .../settings/fuelgauge/ConvertUtilsTest.java | 5 +++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7d6745cb755..4a8d9333680 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1531,12 +1531,6 @@ - - - "com.google.android.gms.persistent" - - @string/color_red diff --git a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java index f075c7b8314..da98d2df8b1 100644 --- a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java @@ -123,10 +123,12 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll mIs24HourFormat = DateFormat.is24HourFormat(context); mNotAllowShowSummaryPackages = context.getResources() .getTextArray(R.array.allowlist_hide_summary_in_battery_usage); - mNotAllowShowEntryPackages = context.getResources() - .getTextArray(R.array.allowlist_hide_entry_in_battery_usage); mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); + mNotAllowShowEntryPackages = + FeatureFactory.getFactory(mContext) + .getPowerUsageFeatureProvider(context) + .getHideApplicationEntries(mContext); if (lifecycle != null) { lifecycle.addObserver(this); } diff --git a/src/com/android/settings/fuelgauge/ConvertUtils.java b/src/com/android/settings/fuelgauge/ConvertUtils.java index a5a58ad2597..4794d42d95a 100644 --- a/src/com/android/settings/fuelgauge/ConvertUtils.java +++ b/src/com/android/settings/fuelgauge/ConvertUtils.java @@ -302,10 +302,10 @@ public final class ConvertUtils { private static void purgeLowPercentageAndFakeData( final Context context, final Map> indexedUsageMap) { - final List backgroundUsageTimeHideList = + final Set backgroundUsageTimeHideList = FeatureFactory.getFactory(context) .getPowerUsageFeatureProvider(context) - .getHideBackgroundUsageTimeList(context); + .getHideBackgroundUsageTimeSet(context); for (List entries : indexedUsageMap.values()) { final Iterator iterator = entries.iterator(); while (iterator.hasNext()) { diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java index 39d1f5a14bf..d5fd6ee5ebe 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java @@ -24,8 +24,8 @@ import android.util.SparseIntArray; import com.android.internal.os.BatterySipper; import com.android.settingslib.fuelgauge.Estimate; -import java.util.List; import java.util.Map; +import java.util.Set; /** * Feature Provider used in power usage @@ -150,7 +150,12 @@ public interface PowerUsageFeatureProvider { Uri getBatteryHistoryUri(); /** - * Returns {@link List} for hidding applications background usage time. + * Returns {@link Set} for hidding applications background usage time. */ - List getHideBackgroundUsageTimeList(Context context); + Set getHideBackgroundUsageTimeSet(Context context); + + /** + * Returns package names for hidding application in the usage screen. + */ + CharSequence[] getHideApplicationEntries(Context context); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index 83f54a42d93..c3ca9ee843d 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -27,9 +27,9 @@ import com.android.internal.os.BatterySipper; import com.android.internal.util.ArrayUtils; import com.android.settingslib.fuelgauge.Estimate; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; import java.util.Map; +import java.util.Set; public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider { @@ -177,7 +177,12 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider } @Override - public List getHideBackgroundUsageTimeList(Context context) { - return new ArrayList<>(); + public Set getHideBackgroundUsageTimeSet(Context context) { + return new HashSet<>(); + } + + @Override + public CharSequence[] getHideApplicationEntries(Context context) { + return new CharSequence[0]; } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java index a56a8231483..ff0f25c3388 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java @@ -40,6 +40,7 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -339,8 +340,8 @@ public final class ConvertUtilsTest { "package3", "label3", 500, 5L, 3600000L, 7200000L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(Long.valueOf(batteryHistoryKeys[2]), entryMap); - when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeList(mContext)) - .thenReturn(Arrays.asList((CharSequence) "package3")); + when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeSet(mContext)) + .thenReturn(new HashSet(Arrays.asList((CharSequence) "package3"))); final Map> purgedResultMap = ConvertUtils.getIndexedUsageMap( From 348cfdbf61d02e368b3624f30b3de8a68699b396 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 2 Sep 2021 15:56:16 +0800 Subject: [PATCH 3/3] Fix Robolectric broken on SplitController Fixes: 198563284 Test: robotest Change-Id: I1f4cd3c972fed4da171feadb8c31b858c85c6757 --- tests/robotests/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index 9b2e97f48aa..43bcec7659a 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -50,6 +50,7 @@ android_app { "contextualcards", "settings-logtags", "zxing-core-1.7", + "windowExtLib", ], aaptflags: ["--extra-packages com.android.settings"],