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

Commit 5c0d6f99 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded... 

am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev

* commit '9de88dad':
  Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
parents b2aa3a74 9de88dad

libs/androidfw/ResourceTypes.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,8 @@ int ResTable_config::diff(const ResTable_config& o) const { 
    if (navigation != o.navigation) diffs |= CONFIG_NAVIGATION;

    if (screenSize != o.screenSize) diffs |= CONFIG_SCREEN_SIZE;

    if (version != o.version) diffs |= CONFIG_VERSION;

    if (screenLayout != o.screenLayout) diffs |= CONFIG_SCREEN_LAYOUT;

    if ((screenLayout & MASK_LAYOUTDIR) != (o.screenLayout & MASK_LAYOUTDIR)) diffs |= CONFIG_LAYOUTDIR;

    if ((screenLayout & ~MASK_LAYOUTDIR) != (o.screenLayout & ~MASK_LAYOUTDIR)) diffs |= CONFIG_SCREEN_LAYOUT;

    if (uiMode != o.uiMode) diffs |= CONFIG_UI_MODE;

    if (smallestScreenWidthDp != o.smallestScreenWidthDp) diffs |= CONFIG_SMALLEST_SCREEN_SIZE;

    if (screenSizeDp != o.screenSizeDp) diffs |= CONFIG_SCREEN_SIZE;