Fix issues with docked icon

- Make sure to update when configuration changes
- Do not reset it to a deprecated icon we don't use
anymore.

Bug: 26451729
Bug: 27045882
Change-Id: I6c23a91fd9577ca836818fcd3ab6a0682880df1f
This commit is contained in:
Jorim Jaggi
2016-02-17 20:27:22 -08:00
parent ea834eca6e
commit d30d95d36c

View File

@@ -79,7 +79,7 @@ public class NavigationBarView extends LinearLayout {
private Drawable mBackAltCarModeIcon, mBackAltLandCarModeIcon;
private Drawable mHomeDefaultIcon, mHomeCarModeIcon;
private Drawable mRecentIcon;
private Drawable mRecentLandIcon;
private Drawable mDockedIcon;
private NavigationBarGestureHelper mGestureHelper;
private DeadZone mDeadZone;
@@ -97,6 +97,7 @@ public class NavigationBarView extends LinearLayout {
private boolean mLayoutTransitionsEnabled = true;
private boolean mWakeAndUnlocking;
private boolean mCarMode = false;
private boolean mDockedStackExists;
private final SparseArray<ButtonDispatcher> mButtonDisatchers = new SparseArray<>();
@@ -280,7 +281,7 @@ public class NavigationBarView extends LinearLayout {
mHomeDefaultIcon = ctx.getDrawable(R.drawable.ic_sysbar_home);
mRecentIcon = ctx.getDrawable(R.drawable.ic_sysbar_recent);
mRecentLandIcon = mRecentIcon;
mDockedIcon = ctx.getDrawable(R.drawable.ic_sysbar_docked);
getCarModeIcons(ctx);
}
@@ -335,8 +336,7 @@ public class NavigationBarView extends LinearLayout {
getBackButton().setImageDrawable(backIcon);
getRecentsButton().setImageDrawable(
mVertical ? mRecentLandIcon : mRecentIcon);
updateRecentsIcon();
if (mCarMode) {
getHomeButton().setImageDrawable(mHomeCarModeIcon);
@@ -507,7 +507,8 @@ public class NavigationBarView extends LinearLayout {
mHandler.post(new Runnable() {
@Override
public void run() {
updateRecentsIcon(exists);
mDockedStackExists = exists;
updateRecentsIcon();
}
});
}
@@ -517,10 +518,8 @@ public class NavigationBarView extends LinearLayout {
}
}
private void updateRecentsIcon(boolean dockedStackExists) {
getRecentsButton().setImageResource(dockedStackExists
? R.drawable.ic_sysbar_docked
: R.drawable.ic_sysbar_recent);
private void updateRecentsIcon() {
getRecentsButton().setImageDrawable(mDockedStackExists ? mDockedIcon : mRecentIcon);
}
public boolean isVertical() {