Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed37b1bf authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Shrink the ticker's icon to match the status bar." into ics-mr0

parents 43642ab9 645e0990

packages/SystemUI/res/layout/status_bar.xml

+9 −7
Original line number Diff line number Diff line
@@ -89,17 +89,19 @@ 
        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"

            android:layout_width="@dimen/status_bar_icon_size"

            android:layout_height="@dimen/status_bar_icon_size"

            android:layout_marginRight="2dip"

            >

            <com.android.systemui.statusbar.AnimatedImageView

                android:layout_width="25dip"

                android:layout_height="25dip"

                android:layout_width="@dimen/status_bar_icon_size"

                android:layout_height="@dimen/status_bar_icon_size"

                android:scaleType="center"

                />

            <com.android.systemui.statusbar.AnimatedImageView

                android:layout_width="25dip"

                android:layout_height="25dip"

                android:layout_width="@dimen/status_bar_icon_size"

                android:layout_height="@dimen/status_bar_icon_size"

                android:scaleType="center"

                />

        </ImageSwitcher>

        <com.android.systemui.statusbar.phone.TickerView android:id="@+id/tickerText"

packages/SystemUI/src/com/android/systemui/statusbar/phone/Ticker.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.phone;



import android.content.Context;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.text.StaticLayout;
@@ -50,6 +51,7 @@ public abstract class Ticker { 
    private View mTickerView;

    private ImageSwitcher mIconSwitcher;

    private TextSwitcher mTextSwitcher;

    private float mIconScale;



    private final class Segment {

        StatusBarNotification notification;
@@ -145,6 +147,11 @@ public abstract class Ticker { 


    public Ticker(Context context, View sb) {

        mContext = context;

        final Resources res = context.getResources();

        final int outerBounds = res.getDimensionPixelSize(R.dimen.status_bar_icon_size);

        final int imageBounds = res.getDimensionPixelSize(R.dimen.status_bar_icon_drawing_size);

        mIconScale = (float)imageBounds / (float)outerBounds;



        mTickerView = sb.findViewById(R.id.ticker);



        mIconSwitcher = (ImageSwitcher)sb.findViewById(R.id.tickerIcon);
@@ -152,6 +159,8 @@ public abstract class Ticker { 
                    AnimationUtils.loadAnimation(context, com.android.internal.R.anim.push_up_in));

        mIconSwitcher.setOutAnimation(

                    AnimationUtils.loadAnimation(context, com.android.internal.R.anim.push_up_out));

        mIconSwitcher.setScaleX(mIconScale);

        mIconSwitcher.setScaleY(mIconScale);



        mTextSwitcher = (TextSwitcher)sb.findViewById(R.id.tickerText);

        mTextSwitcher.setInAnimation(