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

Commit 10a8a2d6 authored by Weng Su's avatar Weng Su
Browse files

Update ObservableActivity to Expressive theme

- Wi-Fi config dialog will inherit updated theme

Bug: 417789078
Flag: EXEMPT refactor
Test: Manual testing
Change-Id: I5ae38a749dcd1c90a58e22037b04db45b2f6a211
parent 1cd6a0f4
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 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.
 */
@@ -49,6 +51,7 @@ public class ObservableActivity extends FragmentActivity implements LifecycleOwn
        mLifecycle.onCreate(savedInstanceState);
        mLifecycle.handleLifecycleEvent(ON_CREATE);
        super.onCreate(savedInstanceState);
        updateTheme();
    }

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

    @Override
@@ -116,4 +120,11 @@ 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);
    }
}