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

Commit 36856c85 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Fix theme issues" into main

parents 3b618a98 e48ade01

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarAppCompatActivity.java

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settingslib.collapsingtoolbar;



import android.app.ActionBar;

import android.content.res.Resources;

import android.os.Build;

import android.os.Bundle;

import android.view.LayoutInflater;
@@ -225,4 +226,16 @@ public class CollapsingToolbarAppCompatActivity extends AppCompatActivity implem 
        }

        return mToolbardelegate;

    }



    /** Returns the current theme and checks if needing to apply expressive theme. */

    @Override

    public Resources.Theme getTheme() {

        Resources.Theme theme = super.getTheme();

        if (SettingsThemeHelper.isExpressiveTheme(this)) {

            theme.applyStyle(

                    com.android.settingslib.widget.theme.R.style.Theme_SubSettingsBase_Expressive,

                    true);

        }

        return theme;

    }

}

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java

+13 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.collapsingtoolbar; 


import android.app.ActionBar;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.Build;

import android.os.Bundle;

import android.view.LayoutInflater;
@@ -225,4 +226,16 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements 
        }

        return mToolbardelegate;

    }



    /** Returns the current theme and checks if needing to apply expressive theme. */

    @Override

    public Resources.Theme getTheme() {

        Resources.Theme theme = super.getTheme();

        if (SettingsThemeHelper.isExpressiveTheme(this)) {

            theme.applyStyle(

                    com.android.settingslib.widget.theme.R.style.Theme_SubSettingsBase_Expressive,

                    true);

        }

        return theme;

    }

}