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

Commit 2bdfd17a authored by Rakesh Iyer's avatar Rakesh Iyer Committed by android-build-merger
Browse files

Merge "Fix issue with app launch from CarNavigationBar." into nyc-dev

am: ef9716d2

* commit 'ef9716d2':
  Fix issue with app launch from CarNavigationBar.
parents a54d4be2 ef9716d2
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ class CarNavigationBarController {
    private List<CarNavigationButton> mNavButtons = new ArrayList<CarNavigationButton>();

    private int mCurrentFacetIndex;
    private String mCurrentPackageName;
    private SparseBooleanArray mFacetHasMultipleAppsCache = new SparseBooleanArray();

    public CarNavigationBarController(Context context,
@@ -84,7 +83,6 @@ class CarNavigationBarController {
    }

    public void taskChanged(String packageName) {
        mCurrentPackageName = packageName;
        // If the package name belongs to a filter, then highlight appropriate button in
        // the navigation bar.
        if (mFacetPackageMap.containsKey(packageName)) {
@@ -298,12 +296,6 @@ class CarNavigationBarController {
            return;
        }

        // Don't launch the lens picker if it's already running and the
        // user clicks the same facet
        if (packageName.equals(mCurrentPackageName) && index == mCurrentFacetIndex) {
            return;
        }

        intent.putExtra(EXTRA_FACET_CATEGORIES, mFacetCategories.get(index));
        intent.putExtra(EXTRA_FACET_PACKAGES, mFacetPackages.get(index));
        // The facet is identified by the index in which it was added to the nav bar.