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

Commit d17d24a5 authored by Michael Stokes's avatar Michael Stokes Committed by Android (Google) Code Review
Browse files

Revert "Disable user aspect ratio button if app not launchable" 

This is a DroidMonitor revert that may or may not be needed, pending
further testing.

This reverts commit 54f94065.

Reason for revert: b/309054453

Change-Id: I09287d014ea7ba5f20046ca3369fe0ba83b1f061
parent 54f94065

services/core/java/com/android/server/wm/Task.java

+2 −5
Original line number Diff line number Diff line
@@ -3508,13 +3508,10 @@ class Task extends TaskFragment { 
                        top.mLetterboxUiController.getLetterboxPositionForVerticalReachability();

            }

        }

        // User Aspect Ratio Settings button is enabled if the app is not in SCM and has

        // launchable activities

        // User Aspect Ratio Settings is enabled if the app is not in SCM

        info.topActivityEligibleForUserAspectRatioButton = top != null

                && !info.topActivityInSizeCompat

                && top.mLetterboxUiController.shouldEnableUserAspectRatioSettings()

                && mAtmService.mContext.getPackageManager()

                    .getLaunchIntentForPackage(getBasePackageName()) != null;

                && top.mLetterboxUiController.shouldEnableUserAspectRatioSettings();

        info.topActivityBoundsLetterboxed = top != null && top.areBoundsLetterboxed();

    }

services/tests/wmtests/src/com/android/server/wm/TaskTests.java

+0 −8
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import android.content.ComponentName; 
import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.graphics.Point;

import android.graphics.Rect;
@@ -571,15 +570,12 @@ public class TaskTests extends WindowTestsBase { 
                .setWindowingMode(WINDOWING_MODE_FULLSCREEN).setDisplay(display).build();

        final Task task = rootTask.getBottomMostTask();

        final ActivityRecord root = task.getTopNonFinishingActivity();

        final PackageManager pm = mContext.getPackageManager();

        spyOn(pm);

        spyOn(mWm.mLetterboxConfiguration);

        spyOn(root);

        spyOn(root.mLetterboxUiController);



        doReturn(true).when(root.mLetterboxUiController)

                .shouldEnableUserAspectRatioSettings();

        doReturn(new Intent()).when(pm).getLaunchIntentForPackage(anyString());

        doReturn(false).when(root).inSizeCompatMode();

        doReturn(task).when(root).getOrganizedTask();
@@ -597,10 +593,6 @@ public class TaskTests extends WindowTestsBase { 
        doReturn(true).when(root).inSizeCompatMode();

        assertFalse(task.getTaskInfo().topActivityEligibleForUserAspectRatioButton);

        doReturn(false).when(root).inSizeCompatMode();



        // When app doesn't have any launchable activities the button is not enabled

        doReturn(null).when(pm).getLaunchIntentForPackage(anyString());

        assertFalse(task.getTaskInfo().topActivityEligibleForUserAspectRatioButton);

    }



    /**