From fbdf8d9e1b9d14cff2902ceab8ecf12113396a37 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Thu, 12 Mar 2015 12:15:38 -0700
Subject: 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
---
 core/java/android/content/res/Configuration.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'core/java/android/content/res')

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;
     }
-- 
cgit v1.1