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

am 044602b2: Merge "Ticker visual fixes." into honeycomb

Browse Source 
* commit '044602b226638e92907fbd573723772856256259':
  Ticker visual fixes.
This commit is contained in:
Daniel Sandler
2011-01-26 12:53:58 -08:00
committed by Android Git Automerger
parent 666b9eb3a2 044602b226
commit 26d7aea7b7
5 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 440 B

16
packages/SystemUI/res/drawable/status_bar_ticker_background.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
<!-- Copyright (C) 2011 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.
@@ -14,14 +14,8 @@
limitations under the License.
-->
<layer-list
<bitmap
xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="translucent"
>
<item
android:drawable="@drawable/ticker_background_color"
android:top="12dp"
/>
</layer-list>
android:tileMode="repeat"
android:src="@drawable/status_bar_ticker_tile"
/>

57
packages/SystemUI/res/layout-xlarge/status_bar_ticker_compat.xml
View File

@@ -18,9 +18,9 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@*android:dimen/status_bar_height"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="@drawable/status_bar_ticker_background"
android:gravity="bottom"
>
<ImageView
@@ -30,29 +30,38 @@
android:scaleType="center"
android:visibility="gone"
/>
<ImageView android:id="@+id/left_icon"
android:layout_width="64dp"
android:layout_height="match_parent"
android:scaleType="center"
android:visibility="gone"
/>
<TextView android:id="@+id/text"
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:gravity="center_vertical"
android:maxLines="2"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@*android:dimen/status_bar_height"
android:layout_weight="1"
android:background="@drawable/status_bar_ticker_background"
>
<ImageView android:id="@+id/left_icon"
android:layout_width="64dp"
android:layout_height="match_parent"
android:scaleType="center"
android:visibility="gone"
/>
<ImageView android:id="@+id/right_icon"
android:layout_width="64dp"
android:layout_height="match_parent"
android:scaleType="center"
android:visibility="gone"
/>
<TextView android:id="@+id/text"
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:gravity="center_vertical"
android:maxLines="2"
/>
<ImageView android:id="@+id/right_icon"
android:layout_width="64dp"
android:layout_height="match_parent"
android:scaleType="center"
android:visibility="gone"
/>
</LinearLayout>
</LinearLayout>

14
packages/SystemUI/res/layout-xlarge/status_bar_ticker_panel.xml
View File

@@ -18,14 +18,10 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="@drawable/status_bar_ticker_background"
android:gravity="bottom"
>
<!--
android:background="@drawable/ticker_background"
-->
<ImageView
android:id="@+id/large_icon"
@@ -34,6 +30,12 @@
android:scaleType="center"
android:visibility="gone"
/>
<!-- TODO: scaleType should be top-left but ImageView doesn't support that. -->
<FrameLayout
android:id="@+id/ticker_expanded"
android:layout_weight="1"
android:layout_height="@*android:dimen/status_bar_height"
android:layout_width="match_parent"
android:background="@drawable/status_bar_ticker_background"
/>
</LinearLayout>

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

@@ -38,7 +38,7 @@ import android.view.WindowManager;
import android.view.WindowManagerImpl;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.android.internal.statusbar.StatusBarIcon;
@@ -173,6 +173,7 @@ public class TabletTicker
mWindow = makeWindow();
WindowManagerImpl.getDefault().addView(mWindow, mWindow.getLayoutParams());
}
mWindow.addView(mCurrentView);
sendEmptyMessageDelayed(MSG_ADVANCE, ADVANCE_DELAY);
break;
@@ -259,10 +260,11 @@ public class TabletTicker
}
if (n.tickerView != null) {
group = (ViewGroup)inflater.inflate(R.layout.status_bar_ticker_panel, null, false);
ViewGroup content = (FrameLayout) group.findViewById(R.id.ticker_expanded);
View expanded = null;
Exception exception = null;
try {
expanded = n.tickerView.apply(mContext, group);
expanded = n.tickerView.apply(mContext, content);
}
catch (RuntimeException e) {
exception = e;
@@ -273,12 +275,10 @@ public class TabletTicker
Slog.e(TAG, "couldn't inflate view for notification " + ident, exception);
return null;
}
final int statusBarHeight = mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.status_bar_height);
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, statusBarHeight, 1.0f);
lp.gravity = Gravity.BOTTOM;
group.addView(expanded, lp);
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT);
content.addView(expanded, lp);
} else if (n.tickerText != null) {
group = (ViewGroup)inflater.inflate(R.layout.status_bar_ticker_compat, mWindow, false);
final Drawable icon = StatusBarIconView.getIcon(mContext,