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

Commit 8a2c4142 authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev 

am: a75d4877

* commit 'a75d4877':
  Have the Resolver/Chooser activities handle resize config changes

Change-Id: I428ddcedf28316cbaf8a6fa4f77ad5ee86949559
parents c2be342b a75d4877

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -3092,6 +3092,7 @@ 
                android:excludeFromRecents="true"

                android:documentLaunchMode="never"

                android:relinquishTaskIdentity="true"

                android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                android:process=":ui">

            <intent-filter>

                <action android:name="android.intent.action.CHOOSER" />

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −1
Original line number Diff line number Diff line
@@ -7874,9 +7874,16 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

                        mResolveActivity.documentLaunchMode = ActivityInfo.DOCUMENT_LAUNCH_NEVER;

                        mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;

                        mResolveActivity.theme = R.style.Theme_Holo_Dialog_Alert;

                        mResolveActivity.theme = R.style.Theme_Material_Dialog_Alert;

                        mResolveActivity.exported = true;

                        mResolveActivity.enabled = true;

                        mResolveActivity.resizeMode = ActivityInfo.RESIZE_MODE_RESIZEABLE;

                        mResolveActivity.configChanges = ActivityInfo.CONFIG_SCREEN_SIZE

                                | ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE

                                | ActivityInfo.CONFIG_SCREEN_LAYOUT

                                | ActivityInfo.CONFIG_ORIENTATION

                                | ActivityInfo.CONFIG_KEYBOARD

                                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN;

                        mResolveInfo.activityInfo = mResolveActivity;

                        mResolveInfo.priority = 0;

                        mResolveInfo.preferredOrder = 0;