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

Commit 28cceb08 authored by d34d's avatar d34d Committed by Steve Kondik
Browse files

Themes: Add CONFIG_THEME_FONT to Configuration.diff() 

We were updating this change in updateFrom() but forgot to add it
to the diff() method, which resulted in fonts not changing.

Change-Id: I88e230f3b148ec7efff095d54186018195e2feec
parent 90f67c14

core/java/android/content/res/Configuration.java

+5 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,11 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        if (delta.themeConfig != null &&

                (themeConfig == null || !themeConfig.equals(delta.themeConfig))) {

            changed |= ActivityInfo.CONFIG_THEME_RESOURCE;

            final String fontPkgName = delta.themeConfig.getFontPkgName();

            if (themeConfig == null ||

                    (fontPkgName != null && !fontPkgName.equals(themeConfig.getFontPkgName()))) {

                changed |= ActivityInfo.CONFIG_THEME_FONT;

            }

        }

        return changed;

    }