diff options
| author | d34d <clark@cyngn.com> | 2015-03-12 12:15:38 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-10-27 17:57:43 -0700 |
| commit | fbdf8d9e1b9d14cff2902ceab8ecf12113396a37 (patch) | |
| tree | 10a07d74b8f418fb474bafb9e398fb13112afccb /core/java/android/content | |
| parent | d9a159474d0327dc7fd2889d25322ecdc9530887 (diff) | |
| download | frameworks_base-fbdf8d9e1b9d14cff2902ceab8ecf12113396a37.zip frameworks_base-fbdf8d9e1b9d14cff2902ceab8ecf12113396a37.tar.gz frameworks_base-fbdf8d9e1b9d14cff2902ceab8ecf12113396a37.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 57f7626..0bc1ec2 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1153,6 +1153,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; } |