Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rakesh Iyer
2016-03-09 22:58:15 +00:00
committed by Android (Google) Code Review
parent 8d774b752b 11e237e6c6
commit ef9716d2fd
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java
View File

@@ -71,7 +71,6 @@ class CarNavigationBarController {
private List<CarNavigationButton> mNavButtons = new ArrayList<CarNavigationButton>(); private List<CarNavigationButton> mNavButtons = new ArrayList<CarNavigationButton>();
private int mCurrentFacetIndex; private int mCurrentFacetIndex;
private String mCurrentPackageName;
private SparseBooleanArray mFacetHasMultipleAppsCache = new SparseBooleanArray(); private SparseBooleanArray mFacetHasMultipleAppsCache = new SparseBooleanArray();
public CarNavigationBarController(Context context, public CarNavigationBarController(Context context,
@@ -84,7 +83,6 @@ class CarNavigationBarController {
} }
public void taskChanged(String packageName) { public void taskChanged(String packageName) {
mCurrentPackageName = packageName;
// If the package name belongs to a filter, then highlight appropriate button in // If the package name belongs to a filter, then highlight appropriate button in
// the navigation bar. // the navigation bar.
if (mFacetPackageMap.containsKey(packageName)) { if (mFacetPackageMap.containsKey(packageName)) {
@@ -298,12 +296,6 @@ class CarNavigationBarController {
return; 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_CATEGORIES, mFacetCategories.get(index));
intent.putExtra(EXTRA_FACET_PACKAGES, mFacetPackages.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. // The facet is identified by the index in which it was added to the nav bar.