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

Merge "Remove lifecycle-extensions from Settings"

Browse Source
This commit is contained in:
Chaohui Wang
2022-11-17 07:15:00 +00:00
committed by Android (Google) Code Review
parent e274c85474 f55f9932d9
commit 125baab6ec
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -72,7 +72,7 @@ android_library {
"setupcompat",
"setupdesign",
"androidx.lifecycle_lifecycle-runtime",
"androidx.lifecycle_lifecycle-extensions",
"androidx.lifecycle_lifecycle-viewmodel",
"guava",
"jsr305",
"net-utils-framework-common",

4
src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java
View File

@@ -35,7 +35,7 @@ import android.widget.ProgressBar;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -62,7 +62,7 @@ public class ProgressDialogFragment extends InstrumentedDialogFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mViewModel = ViewModelProviders.of(this.getActivity()).get(SupportedLinkViewModel.class);
mViewModel = new ViewModelProvider(this.getActivity()).get(SupportedLinkViewModel.class);
}
@Override

4
src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java
View File

@@ -28,7 +28,7 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -50,7 +50,7 @@ public class SupportedLinksDialogFragment extends InstrumentedDialogFragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mPackage = getArguments().getString(AppLaunchSettings.APP_PACKAGE_KEY);
mViewModel = ViewModelProviders.of(this.getActivity()).get(SupportedLinkViewModel.class);
mViewModel = new ViewModelProvider(this.getActivity()).get(SupportedLinkViewModel.class);
mSupportedLinkWrapperList = mViewModel.getSupportedLinkWrapperList();
}

6
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -38,7 +38,7 @@ import android.util.Log;
import android.util.Pair;
import androidx.appcompat.app.AlertDialog;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
@@ -208,7 +208,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
}
final TextToSpeechViewModel ttsViewModel =
ViewModelProviders.of(this).get(TextToSpeechViewModel.class);
new ViewModelProvider(this).get(TextToSpeechViewModel.class);
Pair<TextToSpeech, Boolean> ttsAndNew = ttsViewModel.getTtsAndWhetherNew(mInitListener);
mTts = ttsAndNew.first;
// If the TTS object is not newly created, we need to run the setup on the settings side to
@@ -237,7 +237,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
}
if (!mTts.getDefaultEngine().equals(mTts.getCurrentEngine())) {
final TextToSpeechViewModel ttsViewModel =
ViewModelProviders.of(this).get(TextToSpeechViewModel.class);
new ViewModelProvider(this).get(TextToSpeechViewModel.class);
try {
// If the current engine isn't the default engine shut down the current engine in
// preparation for creating the new engine.

15
src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
View File

@@ -37,7 +37,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import com.android.settings.R;
@@ -195,7 +195,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
}
if (code == mLatestStatusCode) {
throw(new IllegalStateException("Tried restarting EasyConnectSession but still"
throw (new IllegalStateException("Tried restarting EasyConnectSession but still"
+ "receiving EASY_CONNECT_EVENT_FAILURE_BUSY"));
}
@@ -220,7 +220,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK:
throw(new IllegalStateException("Wi-Fi DPP configurator used a non-PSK/non-SAE"
throw (new IllegalStateException("Wi-Fi DPP configurator used a non-PSK/non-SAE"
+ "network to handshake"));
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_CANNOT_FIND_NETWORK:
@@ -238,7 +238,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
break;
default:
throw(new IllegalStateException("Unexpected Wi-Fi DPP error"));
throw (new IllegalStateException("Unexpected Wi-Fi DPP error"));
}
setHeaderTitle(R.string.wifi_dpp_could_not_add_device);
@@ -297,7 +297,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
}
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
new ViewModelProvider(this).get(WifiDppInitiatorViewModel.class);
model.getStatusCode().observe(this, statusCode -> {
// After configuration change, observe callback will be triggered,
@@ -394,7 +394,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
final int networkId =
((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId();
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
new ViewModelProvider(this).get(WifiDppInitiatorViewModel.class);
model.startEasyConnectAsConfiguratorInitiator(qrCode, networkId);
}
@@ -403,6 +403,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
public interface OnClickChooseDifferentNetworkListener {
void onClickChooseDifferentNetwork();
}
private OnClickChooseDifferentNetworkListener mClickChooseDifferentNetworkListener;
@Override
@@ -422,7 +423,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
// Check is Easy Connect handshaking or not
private boolean isEasyConnectHandshaking() {
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
new ViewModelProvider(this).get(WifiDppInitiatorViewModel.class);
return model.isWifiDppHandshaking();
}

8
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -53,7 +53,7 @@ import android.widget.TextView;
import androidx.annotation.StringRes;
import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
@@ -298,7 +298,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
}
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
new ViewModelProvider(this).get(WifiDppInitiatorViewModel.class);
model.getEnrolleeSuccessNetworkId().observe(this, networkId -> {
// After configuration change, observe callback will be triggered,
@@ -719,7 +719,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
private void startWifiDppEnrolleeInitiator(WifiQrCode wifiQrCode) {
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
new ViewModelProvider(this).get(WifiDppInitiatorViewModel.class);
model.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode());
}
@@ -765,7 +765,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
// Check is Easy Connect handshaking or not
private boolean isWifiDppHandshaking() {
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
new ViewModelProvider(this).get(WifiDppInitiatorViewModel.class);
return model.isWifiDppHandshaking();
}

1
tests/robotests/Android.bp
View File

@@ -39,7 +39,6 @@ android_app {
"setupcompat",
"setupdesign",
"androidx.lifecycle_lifecycle-runtime",
"androidx.lifecycle_lifecycle-extensions",
"androidx.test.core",
"androidx.test.runner",
"androidx.test.ext.junit",