Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ea79e87 authored by Weng Su's avatar Weng Su
Browse files

Revert "Update ObservableActivity to Expressive theme" 

This reverts commit 10a8a2d6.

Reason for revert: see more in b/418637456#comment17

Bug: 417789078
Bug: 418637456
Change-Id: I8ef05a85511d17074f55458a53fdb2961af9dda9
parent c89e6b1c

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);

    }

}