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

Revert "[Provider Model] Replace WiFi panel to Internet panel"

Browse Source 
This reverts commit c33f69673a.

Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.

Bug: 190563749
Merged-In: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
(cherry picked from commit 368852424c)
This commit is contained in:
Weng Su
2021-06-09 17:39:53 +00:00
parent 394211dd75
commit 908d4ffadf
3 changed files with 0 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/panel/PanelFeatureProviderImpl.java
View File

@@ -20,8 +20,6 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.Utils;
public class PanelFeatureProviderImpl implements PanelFeatureProvider { public class PanelFeatureProviderImpl implements PanelFeatureProvider {
@Override @Override
@@ -41,9 +39,6 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider {
case Settings.Panel.ACTION_NFC: case Settings.Panel.ACTION_NFC:
return NfcPanel.create(context); return NfcPanel.create(context);
case Settings.Panel.ACTION_WIFI: case Settings.Panel.ACTION_WIFI:
if (Utils.isProviderModelEnabled(context)) {
return InternetConnectivityPanel.create(context);
}
return WifiPanel.create(context); return WifiPanel.create(context);
case Settings.Panel.ACTION_VOLUME: case Settings.Panel.ACTION_VOLUME:
return VolumePanel.create(context); return VolumePanel.create(context);

26
tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
View File

@@ -27,10 +27,7 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.testutils.FeatureFlagUtilsRule;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -39,9 +36,6 @@ public class PanelFeatureProviderImplTest {
private static final String TEST_PACKAGENAME = "com.test.packagename"; private static final String TEST_PACKAGENAME = "com.test.packagename";
@Rule
public final FeatureFlagUtilsRule mFeatureFlagUtilsRule = new FeatureFlagUtilsRule();
private Context mContext; private Context mContext;
private PanelFeatureProviderImpl mProvider; private PanelFeatureProviderImpl mProvider;
private Bundle mBundle; private Bundle mBundle;
@@ -71,24 +65,4 @@ public class PanelFeatureProviderImplTest {
assertThat(panel).isInstanceOf(VolumePanel.class); assertThat(panel).isInstanceOf(VolumePanel.class);
} }
@Test
public void getPanel_wifi_returnsWifiPanelWhenProviderModelDisable() {
mFeatureFlagUtilsRule.setProviderModelEnabled(false);
mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_WIFI);
final PanelContent panel = mProvider.getPanel(mContext, mBundle);
assertThat(panel).isInstanceOf(WifiPanel.class);
}
@Test
public void getPanel_wifi_returnsInternetConnectivityPanelWhenProviderModelDisable() {
mFeatureFlagUtilsRule.setProviderModelEnabled(true);
mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_WIFI);
final PanelContent panel = mProvider.getPanel(mContext, mBundle);
assertThat(panel).isInstanceOf(InternetConnectivityPanel.class);
}
} }

68
tests/unit/src/com/android/settings/testutils/FeatureFlagUtilsRule.java
View File

@@ -1,68 +0,0 @@
/*
* Copyright (C) 2020 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.testutils;
import android.content.Context;
import android.util.FeatureFlagUtils;
import androidx.test.core.app.ApplicationProvider;
import org.junit.rules.ExternalResource;
import java.util.HashMap;
import java.util.Map;
/**
* A test rule that is used to automatically recover the FeatureFlagUtils resource after testing.
*
* Example:
* <pre class="code"><code class="java">
* public class ExampleTest {
*
* &#064;Rule
* public final FeatureFlagUtilsRule mFeatureFlagUtilsRule = new FeatureFlagUtilsRule();
*
* }
* </code></pre>
*/
public class FeatureFlagUtilsRule extends ExternalResource {
private Context mContext;
private Map<String, Boolean> mBackupFeatureFlags = new HashMap<String, Boolean>();
@Override
protected void before() throws Throwable {
mContext = ApplicationProvider.getApplicationContext();
}
@Override
protected void after() {
mBackupFeatureFlags.forEach((k, v) -> FeatureFlagUtils.setEnabled(mContext, k, v));
}
public void setEnabled(String feature, boolean enabled) {
if (enabled == FeatureFlagUtils.isEnabled(mContext, feature)) {
return;
}
mBackupFeatureFlags.putIfAbsent(feature, !enabled);
FeatureFlagUtils.setEnabled(mContext, feature, enabled);
}
public void setProviderModelEnabled(boolean enabled) {
setEnabled(FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, enabled);
}
}