Separate the status bar height from the icon size.
Change-Id: I9cc8c5e8ed2c48d03b7c1c89f1bf7f94cc119171
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 8a92757..99c0b3d 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -28,6 +28,10 @@
<dimen name="toast_y_offset">64dip</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">25dip</dimen>
+ <!-- Height of the status bar -->
+ <dimen name="status_bar_icon_size">25dip</dimen>
+ <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
+ <dimen name="status_bar_edge_ignore">5dp</dimen>
<!-- Size of the fastscroll hint letter -->
<dimen name="fastscroll_overlay_size">104dp</dimen>
<!-- Width of the fastscroll thumb -->
@@ -38,6 +42,4 @@
<dimen name="password_keyboard_key_height">56dip</dimen>
<!-- Default correction for the space key in the password keyboard -->
<dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen>
- <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
- <dimen name="status_bar_edge_ignore">5dp</dimen>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
index 3c14fb5..25b588c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
@@ -112,9 +112,7 @@
StatusBarPolicy mIconPolicy;
- int mHeight;
- int mIconWidth;
-
+ int mIconSize;
Display mDisplay;
StatusBarView mStatusBarView;
int mPixelFormat;
@@ -211,8 +209,7 @@
private void makeStatusBarView(Context context) {
Resources res = context.getResources();
- mHeight = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
- mIconWidth = mHeight;
+ mIconSize = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_icon_size);
ExpandedView expanded = (ExpandedView)View.inflate(context,
R.layout.status_bar_expanded, null);
@@ -277,7 +274,7 @@
StatusBarIconView moreView = new StatusBarIconView(this, "more");
moreView.set(new StatusBarIcon(null, R.drawable.stat_notify_more, 0));
mNotificationIcons.addMoreView(moreView,
- new LinearLayout.LayoutParams(mIconWidth, mHeight));
+ new LinearLayout.LayoutParams(mIconSize, mIconSize));
// set the inital view visibility
setAreThereNotifications();
@@ -293,10 +290,13 @@
@Override
protected void addStatusBarView() {
+ Resources res = getResources();
+ final int height= res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+
final StatusBarView view = mStatusBarView;
WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
- mHeight,
+ height,
WindowManager.LayoutParams.TYPE_STATUS_BAR,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING,
@@ -309,7 +309,7 @@
lp = new WindowManager.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
- mHeight,
+ height,
WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,
WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
| WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
@@ -318,7 +318,7 @@
| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
PixelFormat.TRANSLUCENT);
lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL;
- lp.y += mHeight * 1.5; // for now
+ lp.y += height * 1.5; // for now
lp.setTitle("IntruderAlert");
lp.windowAnimations = android.R.style.Animation_Dialog;
@@ -330,7 +330,7 @@
+ " icon=" + icon);
StatusBarIconView view = new StatusBarIconView(this, slot);
view.set(icon);
- mStatusIcons.addView(view, viewIndex, new LinearLayout.LayoutParams(mIconWidth, mHeight));
+ mStatusIcons.addView(view, viewIndex, new LinearLayout.LayoutParams(mIconSize, mIconSize));
}
public void updateIcon(String slot, int index, int viewIndex,
@@ -379,7 +379,8 @@
}
} else if (notification.notification.fullScreenIntent != null) {
// not immersive & a full-screen alert should be shown
- Slog.d(TAG, "Notification has fullScreenIntent and activity is not immersive; sending fullScreenIntent");
+ Slog.d(TAG, "Notification has fullScreenIntent and activity is not immersive;"
+ + " sending fullScreenIntent");
try {
notification.notification.fullScreenIntent.send();
} catch (PendingIntent.CanceledException e) {
@@ -577,7 +578,7 @@
// Add the icon.
final int iconIndex = chooseIconIndex(isOngoing, viewIndex);
mNotificationIcons.addView(iconView, iconIndex,
- new LinearLayout.LayoutParams(mIconWidth, mHeight));
+ new LinearLayout.LayoutParams(mIconSize, mIconSize));
return iconView;
}
