Remove lifecycle-extensions from Settings (f55f9932) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",

src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}

src/com/android/settings/tts/TextToSpeechSettings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.

src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -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;

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