drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix SystemUI navigation bar recent icon loading in landscape mode"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-01-17 23:09:13 +00:00
committed by Android (Google) Code Review
parent c51d96a95b 18d9824be0
commit d859e7088a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@ -75,7 +75,8 @@ public class NavigationBarView extends LinearLayout {
private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon; private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;
private Drawable mRecentIcon; private Drawable mRecentIcon;
private Drawable mRecentLandIcon;
private DelegateViewHelper mDelegateHelper; private DelegateViewHelper mDelegateHelper;
private DeadZone mDeadZone; private DeadZone mDeadZone;
@ -179,6 +180,7 @@ public class NavigationBarView extends LinearLayout {
mBackAltIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime); mBackAltIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime);
mBackAltLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime); mBackAltLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime);
mRecentIcon = res.getDrawable(R.drawable.ic_sysbar_recent); mRecentIcon = res.getDrawable(R.drawable.ic_sysbar_recent);
mRecentLandIcon = res.getDrawable(R.drawable.ic_sysbar_recent_land);
} }
@Override @Override
@ -238,7 +240,7 @@ public class NavigationBarView extends LinearLayout {
? (mVertical ? mBackAltLandIcon : mBackAltIcon) ? (mVertical ? mBackAltLandIcon : mBackAltIcon)
: (mVertical ? mBackLandIcon : mBackIcon)); : (mVertical ? mBackLandIcon : mBackIcon));
((ImageView)getRecentsButton()).setImageDrawable(mRecentIcon); ((ImageView)getRecentsButton()).setImageDrawable(mVertical ? mRecentLandIcon : mRecentIcon);
setDisabledFlags(mDisabledFlags, true); setDisabledFlags(mDisabledFlags, true);
} }