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

Commit 723453a7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am e9da0c1d: Merge "Fix issue #3408542: "resizeable" attribute required to get... 

am e9da0c1d: Merge "Fix issue #3408542: "resizeable" attribute required to get out of compat mode" into honeycomb

* commit 'e9da0c1d':
  Fix issue #3408542: "resizeable" attribute required to get out of compat mode
parents ed6f13c4 e9da0c1d

core/java/android/content/res/CompatibilityInfo.java

+8 −2
Original line number Diff line number Diff line
@@ -141,10 +141,16 @@ public class CompatibilityInfo { 
        appFlags = appInfo.flags;

        

        if ((appInfo.flags & ApplicationInfo.FLAG_SUPPORTS_LARGE_SCREENS) != 0) {

            mCompatibilityFlags |= LARGE_SCREENS | CONFIGURED_LARGE_SCREENS;

            // Saying you support large screens also implies you support xlarge

            // screens; there is no compatibility mode for a large app on an

            // xlarge screen.

            mCompatibilityFlags |= LARGE_SCREENS | CONFIGURED_LARGE_SCREENS

                    | XLARGE_SCREENS | CONFIGURED_XLARGE_SCREENS

                    | EXPANDABLE | CONFIGURED_EXPANDABLE;

        }

        if ((appInfo.flags & ApplicationInfo.FLAG_SUPPORTS_XLARGE_SCREENS) != 0) {

            mCompatibilityFlags |= XLARGE_SCREENS | CONFIGURED_XLARGE_SCREENS;

            mCompatibilityFlags |= XLARGE_SCREENS | CONFIGURED_XLARGE_SCREENS

                    | EXPANDABLE | CONFIGURED_EXPANDABLE;

        }

        if ((appInfo.flags & ApplicationInfo.FLAG_RESIZEABLE_FOR_SCREENS) != 0) {

            mCompatibilityFlags |= EXPANDABLE | CONFIGURED_EXPANDABLE;