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

Merge "Incremental system bar improvements."

Browse Source
This commit is contained in:
Daniel Sandler
2010-08-10 16:50:57 -07:00
committed by Android (Google) Code Review
parent ea48ff4ba4 dfa08db165
commit 139f8f7ec3
13 changed files with 334 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/SystemUI/res/drawable-hdpi/status_bar_expand_default.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
packages/SystemUI/res/drawable-hdpi/status_bar_expand_pressed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
packages/SystemUI/res/drawable-mdpi/status_bar_expand_default.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
packages/SystemUI/res/drawable-mdpi/status_bar_expand_pressed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

21
packages/SystemUI/res/drawable/status_bar_expand.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/status_bar_expand_pressed" />
<item android:drawable="@drawable/status_bar_expand_default" />
</selector>

129
packages/SystemUI/res/layout-xlarge/status_bar.xml
View File

@@ -39,13 +39,13 @@
android:onClick="notificationIconsClicked"
android:background="@drawable/status_bar_icon_tray"
>
<view
<ImageView
class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView"
android:id="@+id/more"
android:id="@+id/expand"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/stat_notify_more"
android:layout_marginLeft="10dip"
android:layout_height="wrap_content"
android:src="@drawable/status_bar_expand"
android:onClick="notificationIconsClicked"
/>
<view
class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"
@@ -64,39 +64,47 @@
</com.android.systemui.statusbar.tablet.NotificationIconArea>
<RelativeLayout android:id="@+id/systemInfo"
android:layout_width="200dip"
<LinearLayout android:id="@+id/ticker"
android:layout_width="300dip"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:clickable="true"
android:onClick="systemInfoClicked"
android:paddingLeft="6dip"
android:animationCache="false"
android:layout_alignLeft="@id/notificationIcons"
android:layout_alignTop="@id/notificationIcons"
android:orientation="horizontal"
android:visibility="gone"
>
<com.android.systemui.statusbar.Clock
android:id="@+id/clock"
android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon"
<ImageView android:id="@+id/tickerIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:singleLine="true"
android:textSize="16sp"
android:textStyle="bold"
android:padding="6dip"
android:layout_height="match_parent"
android:layout_marginRight="8dip"
/>
<ImageView
android:layout_width="wrap_content"
<com.android.systemui.statusbar.TickerView android:id="@+id/tickerText"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/clock"
android:layout_centerVertical="true"
android:src="@drawable/dots_empty"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/clock"
android:layout_centerVertical="true"
android:src="@drawable/dots_full"
/>
</RelativeLayout>
android:paddingTop="2dip"
android:paddingRight="10dip">
<TextView
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
/>
<TextView
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
/>
</com.android.systemui.statusbar.TickerView>
</LinearLayout>
<include layout="@layout/status_bar_center"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
/>
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/back"
android:layout_width="wrap_content"
@@ -125,60 +133,5 @@
android:src="@drawable/status_bar_home"
systemui:keyCode="3"
/>
<!--
<LinearLayout android:id="@+id/ticker"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="6dip"
android:animationCache="false"
android:orientation="horizontal" >
<ImageSwitcher android:id="@+id/tickerIcon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="8dip"
>
<com.android.systemui.statusbar.AnimatedImageView
android:layout_width="25dip"
android:layout_height="25dip"
/>
<com.android.systemui.statusbar.AnimatedImageView
android:layout_width="25dip"
android:layout_height="25dip"
/>
</ImageSwitcher>
<com.android.systemui.statusbar.TickerView android:id="@+id/tickerText"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:paddingTop="2dip"
android:paddingRight="10dip">
<TextView
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
/>
<TextView
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
/>
</com.android.systemui.statusbar.TickerView>
</LinearLayout>
<com.android.systemui.statusbar.DateView android:id="@+id/date"
android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:singleLine="true"
android:gravity="center_vertical|left"
android:paddingLeft="6px"
android:paddingRight="6px"
android:background="@drawable/status_bar_background"
/>
-->
</RelativeLayout>

53
packages/SystemUI/res/layout-xlarge/status_bar_center.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Center of status bar: System info display, system info panel trigger -->
<RelativeLayout android:id="@+id/systemInfo"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
android:layout_width="100dip"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:onClick="systemInfoClicked"
>
<com.android.systemui.statusbar.Clock
style="@*android:style/TextAppearance.StatusBar.Icon"
android:id="@+id/clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textSize="16sp"
android:textStyle="bold"
android:padding="2dip"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/clock"
android:src="@drawable/dots_empty"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/clock"
android:src="@drawable/dots_full"
/>
</RelativeLayout>

28
packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml
View File

@@ -46,17 +46,23 @@
android:background="@android:drawable/divider_horizontal_dark"
/>
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
<ScrollView
android:id="@+id/notificationScroller"
android:layout_height="wrap_content"
android:gravity="center_horizontal|bottom"
android:animationCache="false"
android:orientation="vertical"
android:background="@drawable/status_bar_background"
android:clickable="true"
android:focusable="true"
android:descendantFocusability="afterDescendants"
android:layout_width="match_parent"
>
</LinearLayout>
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|bottom"
android:animationCache="false"
android:orientation="vertical"
android:background="@drawable/status_bar_background"
android:clickable="true"
android:focusable="true"
android:descendantFocusability="afterDescendants"
>
</LinearLayout>
</ScrollView>
</LinearLayout>

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

@@ -1086,12 +1086,12 @@ public class PhoneStatusBarService extends StatusBarService {
}
private class MyTicker extends Ticker {
MyTicker(Context context, StatusBarView sb) {
MyTicker(Context context, View sb) {
super(context, sb);
}
@Override
void tickerStarting() {
public void tickerStarting() {
mTicking = true;
mIcons.setVisibility(View.GONE);
mTickerView.setVisibility(View.VISIBLE);
@@ -1103,7 +1103,7 @@ public class PhoneStatusBarService extends StatusBarService {
}
@Override
void tickerDone() {
public void tickerDone() {
mIcons.setVisibility(View.VISIBLE);
mTickerView.setVisibility(View.GONE);
mIcons.startAnimation(loadAnim(com.android.internal.R.anim.push_down_in, null));
@@ -1114,7 +1114,7 @@ public class PhoneStatusBarService extends StatusBarService {
}
}
void tickerHalting() {
public void tickerHalting() {
mIcons.setVisibility(View.VISIBLE);
mTickerView.setVisibility(View.GONE);
mIcons.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));

16
packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java
View File

@@ -141,7 +141,7 @@ public abstract class Ticker {
}
};
Ticker(Context context, StatusBarView sb) {
public Ticker(Context context, View sb) {
mContext = context;
mTickerView = sb.findViewById(R.id.ticker);
@@ -163,7 +163,7 @@ public abstract class Ticker {
}
void addEntry(StatusBarNotification n) {
public void addEntry(StatusBarNotification n) {
int initialCount = mSegments.size();
// If what's being displayed has the same text and icon, just drop it
@@ -212,7 +212,7 @@ public abstract class Ticker {
}
}
void removeEntry(StatusBarNotification n) {
public void removeEntry(StatusBarNotification n) {
for (int i=mSegments.size()-1; i>=0; i--) {
Segment seg = mSegments.get(i);
if (n.id == seg.notification.id && n.pkg.equals(seg.notification.pkg)) {
@@ -221,13 +221,13 @@ public abstract class Ticker {
}
}
void halt() {
public void halt() {
mHandler.removeCallbacks(mAdvanceTicker);
mSegments.clear();
tickerHalting();
}
void reflowText() {
public void reflowText() {
if (mSegments.size() > 0) {
Segment seg = mSegments.get(0);
CharSequence text = seg.getText();
@@ -266,8 +266,8 @@ public abstract class Ticker {
mHandler.postDelayed(mAdvanceTicker, TICKER_SEGMENT_DELAY);
}
abstract void tickerStarting();
abstract void tickerDone();
abstract void tickerHalting();
public abstract void tickerStarting();
public abstract void tickerDone();
public abstract void tickerHalting();
}

4
packages/SystemUI/src/com/android/systemui/statusbar/TickerView.java
View File

@@ -34,5 +34,9 @@ public class TickerView extends TextSwitcher
super.onSizeChanged(w, h, oldw, oldh);
mTicker.reflowText();
}
public void setTicker(Ticker t) {
mTicker = t;
}
}

8
packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java
View File

@@ -31,24 +31,16 @@ import com.android.systemui.R;
public class NotificationIconArea extends LinearLayout {
private static final String TAG = "NotificationIconArea";
MoreView mMoreView;
IconLayout mIconLayout;
DraggerView mDraggerView;
public NotificationIconArea(Context context, AttributeSet attrs) {
super(context, attrs);
mMoreView = (MoreView) findViewById(R.id.more);
mIconLayout = (IconLayout)findViewById(R.id.icons);
mDraggerView = (DraggerView) findViewById(R.id.handle);
}
static class MoreView extends ImageView {
public MoreView(Context context, AttributeSet attrs) {
super(context, attrs);
}
}
static class IconLayout extends LinearLayout {
public IconLayout(Context context, AttributeSet attrs) {
super(context, attrs);

223
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java
View File

@@ -16,30 +16,34 @@
package com.android.systemui.statusbar.tablet;
import android.animation.Animator;
import android.app.ActivityManagerNative;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.Service;
import android.app.StatusBarManager;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.RemoteException;
import android.util.Slog;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.widget.RemoteViews;
import android.app.ActivityManagerNative;
import android.app.PendingIntent;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.graphics.Rect;
import android.os.RemoteException;
import android.view.WindowManagerImpl;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RemoteViews;
import android.widget.ScrollView;
import android.widget.TextSwitcher;
import android.widget.TextView;
import com.android.internal.statusbar.StatusBarIcon;
@@ -53,13 +57,18 @@ public class TabletStatusBarService extends StatusBarService {
public static final boolean DEBUG = false;
public static final String TAG = "TabletStatusBar";
View mStatusBarView;
NotificationIconArea mNotificationIconArea;
int mIconSize;
H mHandler = new H();
// tracking all current notifications
private NotificationData mNotns = new NotificationData();
View mStatusBarView;
NotificationIconArea mNotificationIconArea;
View mNotificationPanel;
View mSystemPanel;
@@ -68,8 +77,14 @@ public class TabletStatusBarService extends StatusBarService {
NotificationIconArea.IconLayout mIconLayout;
private NotificationData mNotns = new NotificationData();
KickerController mKicker;
View mKickerView;
boolean mTicking;
boolean mExpandedVisible;
// for disabling the status bar
int mDisabled = 0;
protected void addPanelWindows() {
mNotificationPanel = View.inflate(this, R.layout.sysbar_panel_notifications, null);
mSystemPanel = View.inflate(this, R.layout.sysbar_panel_system, null);
@@ -86,8 +101,8 @@ public class TabletStatusBarService extends StatusBarService {
ViewGroup.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,
WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
| WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
PixelFormat.TRANSLUCENT);
@@ -102,8 +117,8 @@ public class TabletStatusBarService extends StatusBarService {
200, // ViewGroup.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,
WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
| WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
PixelFormat.TRANSLUCENT);
@@ -112,23 +127,11 @@ public class TabletStatusBarService extends StatusBarService {
lp.windowAnimations = com.android.internal.R.style.Animation_SlidingCard;
WindowManagerImpl.getDefault().addView(mSystemPanel, lp);
// Lorem ipsum, Dolores
TextView tv = ((TextView) mSystemPanel.findViewById(R.id.systemPanelDummy));
if (tv != null) tv.setText("System status: great");
mPile = (ViewGroup)mNotificationPanel.findViewById(R.id.content);
mPile.removeAllViews();
mClearButton = (TextView)mNotificationPanel.findViewById(R.id.clear_all_button);
mClearButton.setOnClickListener(mClearButtonListener);
}
@Override
public void onCreate() {
super.onCreate(); // will add the main bar view
addPanelWindows();
}
protected View makeStatusBarView() {
@@ -145,6 +148,24 @@ public class TabletStatusBarService extends StatusBarService {
// where the icons go
mIconLayout = (NotificationIconArea.IconLayout) sb.findViewById(R.id.icons);
mKicker = new KickerController((Context)this, mStatusBarView);
// Add the windows
addPanelWindows();
// Lorem ipsum, Dolores
TextView tv = ((TextView) mSystemPanel.findViewById(R.id.systemPanelDummy));
if (tv != null) tv.setText("System status: great");
mPile = (ViewGroup)mNotificationPanel.findViewById(R.id.content);
mPile.removeAllViews();
ScrollView scroller = (ScrollView)mPile.getParent();
scroller.setFillViewport(true);
mClearButton = (TextView)mNotificationPanel.findViewById(R.id.clear_all_button);
mClearButton.setOnClickListener(mClearButtonListener);
return sb;
}
@@ -162,10 +183,12 @@ public class TabletStatusBarService extends StatusBarService {
case MSG_OPEN_NOTIFICATION_PANEL:
if (DEBUG) Slog.d(TAG, "opening notifications panel");
mNotificationPanel.setVisibility(View.VISIBLE);
mExpandedVisible = true;
break;
case MSG_CLOSE_NOTIFICATION_PANEL:
if (DEBUG) Slog.d(TAG, "closing notifications panel");
mNotificationPanel.setVisibility(View.GONE);
mExpandedVisible = false;
break;
case MSG_OPEN_SYSTEM_PANEL:
if (DEBUG) Slog.d(TAG, "opening system panel");
@@ -195,8 +218,7 @@ public class TabletStatusBarService extends StatusBarService {
public void addNotification(IBinder key, StatusBarNotification notification) {
if (DEBUG) Slog.d(TAG, "addNotification(" + key + " -> " + notification + ")");
addNotificationViews(key, notification);
// TODO: kicker; immersive mode
// tick()
}
public void updateNotification(IBinder key, StatusBarNotification notification) {
@@ -274,7 +296,127 @@ public class TabletStatusBarService extends StatusBarService {
}
public void disable(int state) {
// TODO
/*
final int old = mDisabled;
final int diff = state ^ old;
mDisabled = state;
if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
if ((state & StatusBarManager.DISABLE_EXPAND) != 0) {
Slog.d(TAG, "DISABLE_EXPAND: yes");
animateCollapse();
}
}
if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
if ((state & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: yes");
if (mTicking) {
mKicker.halt();
} else {
mNotificationIconArea.setVisibility(View.INVISIBLE);
}
} else {
Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: no");
if (!mExpandedVisible) {
mNotificationIconArea.setVisibility(View.VISIBLE);
}
}
} else if ((diff & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
if (mTicking && (state & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
Slog.d(TAG, "DISABLE_NOTIFICATION_TICKER: yes");
mKicker.halt();
}
}
*/
}
void performDisableActions(int net) {
/*
int old = mDisabled;
int diff = net ^ old;
mDisabled = net;
// act accordingly
if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {
Slog.d(TAG, "DISABLE_EXPAND: yes");
animateCollapse();
}
}
if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
if ((net & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: yes");
if (mTicking) {
mNotificationIconArea.setVisibility(View.INVISIBLE);
mKicker.halt();
} else {
mNotificationIconArea.setVisibility(View.INVISIBLE);
}
} else {
Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: no");
if (!mExpandedVisible) {
mNotificationIconArea.setVisibility(View.VISIBLE);
}
}
} else if ((diff & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
if (mTicking && (net & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
mKicker.halt();
}
}
*/
}
private void tick(StatusBarNotification n) {
// Show the ticker if one is requested. Also don't do this
// until status bar window is attached to the window manager,
// because... well, what's the point otherwise? And trying to
// run a ticker without being attached will crash!
if (n.notification.tickerText != null && mStatusBarView.getWindowToken() != null) {
if (0 == (mDisabled & (StatusBarManager.DISABLE_NOTIFICATION_ICONS
| StatusBarManager.DISABLE_NOTIFICATION_TICKER))) {
mKicker.addEntry(n);
}
}
}
private class KickerController {
View mView;
ImageView mKickerIcon;
TextSwitcher mKickerText;
public KickerController(Context context, View sb) {
mView = sb.findViewById(R.id.ticker);
mKickerIcon = (ImageView) mView.findViewById(R.id.tickerIcon);
mKickerText = (TextSwitcher) mView.findViewById(R.id.tickerText);
}
public void halt() {
tickerHalting();
}
public void addEntry(StatusBarNotification n) {
mKickerIcon.setImageResource(n.notification.icon);
mKickerText.setCurrentText(n.notification.tickerText);
tickerStarting();
}
public void tickerStarting() {
mTicking = true;
mIconLayout.setVisibility(View.GONE);
mKickerView.setVisibility(View.VISIBLE);
}
public void tickerDone() {
mIconLayout.setVisibility(View.VISIBLE);
mKickerView.setVisibility(View.GONE);
mTicking = false;
}
public void tickerHalting() {
mIconLayout.setVisibility(View.VISIBLE);
mKickerView.setVisibility(View.GONE);
mTicking = false;
}
}
public void animateExpand() {
@@ -405,8 +547,9 @@ public class TabletStatusBarService extends StatusBarService {
}
StatusBarIconView addNotificationViews(IBinder key, StatusBarNotification notification) {
NotificationData list = mNotns;
ViewGroup parent = mPile;
if (DEBUG) {
Slog.d(TAG, "addNotificationViews(key=" + key + ", notification=" + notification);
}
// Construct the icon.
final StatusBarIconView iconView = new StatusBarIconView(this,
notification.pkg + "/0x" + Integer.toHexString(notification.id));
@@ -422,19 +565,13 @@ public class TabletStatusBarService extends StatusBarService {
}
// Construct the expanded view.
NotificationData.Entry entry = new NotificationData.Entry(key, notification, iconView);
if (!inflateViews(entry, parent)) {
if (!inflateViews(entry, mPile)) {
handleNotificationError(key, notification, "Couldn't expand RemoteViews for: "
+ notification);
return null;
}
// Add the expanded view.
final int viewIndex = list.add(entry);
if (parent != null) parent.addView(entry.row, viewIndex);
// Add the icon.
// final int iconIndex = 0; // XXX: sort into ongoing and regular buckets
// mIconLayout.addView(iconView, iconIndex,
// new LinearLayout.LayoutParams(mIconSize, mIconSize));
mNotns.add(entry);
refreshIcons();
return iconView;
@@ -443,13 +580,25 @@ public class TabletStatusBarService extends StatusBarService {
private void refreshIcons() {
// XXX: need to implement a new limited linear layout class
// to avoid removing & readding everything
mIconLayout.removeAllViews();
int N = mNotns.size();
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(mIconSize, mIconSize);
if (DEBUG) {
Slog.d(TAG, "refreshing icons (" + N + " notifications, mIconLayout="
+ mIconLayout + ", mPile=" + mPile);
}
mIconLayout.removeAllViews();
for (int i=0; i<4; i++) {
if (i>=N) break;
mIconLayout.addView(mNotns.get(N-i-1).icon, i, params);
}
mPile.removeAllViews();
for (int i=0; i<N; i++) {
mPile.addView(mNotns.get(N-i-1).row);
}
}
private boolean inflateViews(NotificationData.Entry entry, ViewGroup parent) {