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

[Wi-Fi DPP] remove unused code

Browse Source 
Bug: 120645817
Test: atest com.android.settings.wifi.dpp
Change-Id: I467888de0efe8ae663863e9eacc15e77d32487d2
This commit is contained in:
Arc Wang
2019-07-08 18:23:56 +08:00
parent 7c896fa1c0
commit 2d211208d6
3 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
View File

@@ -57,7 +57,6 @@ import java.util.List;
*/ */
public class WifiDppConfiguratorActivity extends InstrumentedActivity implements public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
WifiNetworkConfig.Retriever, WifiNetworkConfig.Retriever,
WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,
WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener, WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,
WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener, WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener,
WifiNetworkListFragment.OnChooseNetworkListener { WifiNetworkListFragment.OnChooseNetworkListener {
@@ -137,7 +136,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
cancelActivity = true; cancelActivity = true;
} else { } else {
mWifiNetworkConfig = config; mWifiNetworkConfig = config;
showQrCodeScannerFragment(/* addToBackStack= */ false); showQrCodeScannerFragment();
} }
break; break;
case ACTION_CONFIGURATOR_QR_CODE_GENERATOR: case ACTION_CONFIGURATOR_QR_CODE_GENERATOR:
@@ -180,7 +179,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
} }
} }
private void showQrCodeScannerFragment(boolean addToBackStack) { private void showQrCodeScannerFragment() {
WifiDppQrCodeScannerFragment fragment = WifiDppQrCodeScannerFragment fragment =
(WifiDppQrCodeScannerFragment) mFragmentManager.findFragmentByTag( (WifiDppQrCodeScannerFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER); WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
@@ -201,9 +200,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
fragmentTransaction.replace(R.id.fragment_container, fragment, fragmentTransaction.replace(R.id.fragment_container, fragment,
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER); WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
if (addToBackStack) {
fragmentTransaction.addToBackStack(/* name */ null);
}
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
@@ -323,11 +319,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
return true; return true;
} }
@Override
public void onQrCodeGeneratorFragmentAddButtonClicked() {
showQrCodeScannerFragment(/* addToBackStack */ true);
}
@Override @Override
public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) { public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
mWifiDppQrCode = wifiQrCode; mWifiDppQrCode = wifiQrCode;

20
src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
View File

@@ -52,12 +52,6 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR; return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
} }
// Container Activity must implement this interface
public interface OnQrCodeGeneratorFragmentAddButtonClickedListener {
public void onQrCodeGeneratorFragmentAddButtonClicked();
}
OnQrCodeGeneratorFragmentAddButtonClickedListener mListener;
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
@@ -71,20 +65,6 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
} }
} }
@Override
public void onAttach(Context context) {
super.onAttach(context);
mListener = (OnQrCodeGeneratorFragmentAddButtonClickedListener) context;
}
@Override
public void onDetach() {
mListener = null;
super.onDetach();
}
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
final MenuItem menuItem = menu.findItem(Menu.FIRST); final MenuItem menuItem = menu.findItem(Menu.FIRST);

8
tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
View File

@@ -107,14 +107,6 @@ public class WifiDppConfiguratorActivityTest {
assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue(); assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue();
} }
@Test
public void testActivity_shouldImplementsQrCodeGeneratorFragmentCallback() {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiDppQrCodeGeneratorFragment
.OnQrCodeGeneratorFragmentAddButtonClickedListener).isTrue();
}
@Test @Test
public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() { public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity(); WifiDppConfiguratorActivity activity = mActivityRule.getActivity();