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

Commit ebb8ee15 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by android-build-merger
Browse files

Workaround to make CarSystemUi work on the multiple displays. 

am: d9f8b174

Change-Id: Ib84a1e41dd29f3f5c628755800b30f4008bae1b4
parents 93cf7293 d9f8b174

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarFacetButtonController.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.util.Log;

import android.view.Display;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;
@@ -113,8 +113,10 @@ public class CarFacetButtonController { 
    public void taskChanged(List<ActivityManager.StackInfo> stackInfoList) {

    public void taskChanged(List<ActivityManager.StackInfo> stackInfoList) {

        ActivityManager.StackInfo validStackInfo = null;

        ActivityManager.StackInfo validStackInfo = null;

        for (ActivityManager.StackInfo stackInfo : stackInfoList) {

        for (ActivityManager.StackInfo stackInfo : stackInfoList) {

            // Find the first stack info with a topActivity

            // Find the first stack info with a topActivity in the primary display.

            if (stackInfo.topActivity != null) {

            // TODO: We assume that CarFacetButton will launch an app only in the primary display.

            // We need to extend the functionality to handle the mutliple display properly.

            if (stackInfo.topActivity != null && stackInfo.displayId == Display.DEFAULT_DISPLAY) {

                validStackInfo = stackInfo;

                validStackInfo = stackInfo;

                break;

                break;

            }

            }