Merge "Revert "Update ObservableActivity to Expressive theme"" into main (ad0e49c0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableActivity.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ import androidx.annotation.Nullable;
		import androidx.fragment.app.FragmentActivity;
		import androidx.lifecycle.LifecycleOwner;

		import com.android.settingslib.widget.SettingsThemeHelper;

		/**
		* {@link Activity} that has hooks to observe activity lifecycle events.
		*/
		@@ -51,7 +49,6 @@ public class ObservableActivity extends FragmentActivity implements LifecycleOwn
		mLifecycle.onCreate(savedInstanceState);
		mLifecycle.handleLifecycleEvent(ON_CREATE);
		super.onCreate(savedInstanceState);
		updateTheme();
		}

		@Override
		@@ -61,7 +58,6 @@ public class ObservableActivity extends FragmentActivity implements LifecycleOwn
		mLifecycle.onCreate(savedInstanceState);
		mLifecycle.handleLifecycleEvent(ON_CREATE);
		super.onCreate(savedInstanceState, persistentState);
		updateTheme();
		}

		@Override
		@@ -120,11 +116,4 @@ public class ObservableActivity extends FragmentActivity implements LifecycleOwn
		}
		return lifecycleHandled;
		}

		private void updateTheme() {
		int resId = SettingsThemeHelper.isExpressiveTheme(this)
		? com.android.settingslib.widget.theme.R.style.Theme_SubSettingsBase_Expressive
		: com.android.settingslib.widget.theme.R.style.Theme_SubSettingsBase;
		setTheme(resId);
		}
		}