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

Merge "Fix double status bar icons" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-08-29 18:00:00 +00:00
committed by Android (Google) Code Review
parent 4226dcef1e 12124d7eca
commit 2b4e612b10
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -3442,7 +3442,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
repositionNavigationBar(); repositionNavigationBar();
updateRowStates(); updateRowStates();
mIconController.defineSlots();
mScreenPinningRequest.onConfigurationChanged(); mScreenPinningRequest.onConfigurationChanged();
mNetworkController.onConfigurationChanged(); mNetworkController.onConfigurationChanged();
} }

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
View File

@@ -112,6 +112,8 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl
public StatusBarIconController(Context context, View statusBar, View keyguardStatusBar, public StatusBarIconController(Context context, View statusBar, View keyguardStatusBar,
PhoneStatusBar phoneStatusBar) { PhoneStatusBar phoneStatusBar) {
super(context.getResources().getStringArray(
com.android.internal.R.array.config_statusBarIcons));
mContext = context; mContext = context;
mPhoneStatusBar = phoneStatusBar; mPhoneStatusBar = phoneStatusBar;
mSystemIconArea = (LinearLayout) statusBar.findViewById(R.id.system_icon_area); mSystemIconArea = (LinearLayout) statusBar.findViewById(R.id.system_icon_area);
@@ -137,7 +139,6 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl
mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone); mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone);
mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone); mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone);
mHandler = new Handler(); mHandler = new Handler();
defineSlots();
loadDimens(); loadDimens();
TunerService.get(mContext).addTunable(this, ICON_BLACKLIST); TunerService.get(mContext).addTunable(this, ICON_BLACKLIST);
@@ -197,11 +198,6 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl
R.dimen.status_bar_icon_padding); R.dimen.status_bar_icon_padding);
} }
public void defineSlots() {
defineSlots(mContext.getResources().getStringArray(
com.android.internal.R.array.config_statusBarIcons));
}
private void addSystemIcon(int index, StatusBarIcon icon) { private void addSystemIcon(int index, StatusBarIcon icon) {
String slot = getSlot(index); String slot = getSlot(index);
int viewIndex = getViewIndex(index); int viewIndex = getViewIndex(index);

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconList.java
View File

@@ -25,14 +25,11 @@ public class StatusBarIconList {
private ArrayList<String> mSlots = new ArrayList<>(); private ArrayList<String> mSlots = new ArrayList<>();
private ArrayList<StatusBarIcon> mIcons = new ArrayList<>(); private ArrayList<StatusBarIcon> mIcons = new ArrayList<>();
public void defineSlots(String[] slots) { public StatusBarIconList(String[] slots) {
mSlots.clear();
final int N = slots.length; final int N = slots.length;
for (int i=0; i < N; i++) { for (int i=0; i < N; i++) {
mSlots.add(slots[i]); mSlots.add(slots[i]);
if (mIcons.size() < mSlots.size()) { mIcons.add(null);
mIcons.add(null);
}
} }
} }