Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0
This commit is contained in:
@@ -147,6 +147,11 @@ public class ImageView extends View {
|
||||
setColorFilter(tint);
|
||||
}
|
||||
|
||||
int alpha = a.getInt(com.android.internal.R.styleable.ImageView_drawableAlpha, 255);
|
||||
if (alpha != 255) {
|
||||
setAlpha(alpha);
|
||||
}
|
||||
|
||||
mCropToPadding = a.getBoolean(
|
||||
com.android.internal.R.styleable.ImageView_cropToPadding, false);
|
||||
|
||||
|
||||
@@ -25,14 +25,12 @@
|
||||
android:fadingEdge="horizontal"
|
||||
android:ellipsize="marquee"
|
||||
android:visibility="gone"
|
||||
android:alpha="0.7"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:id="@+id/line3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:alpha="0.7"
|
||||
>
|
||||
<TextView android:id="@+id/text"
|
||||
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
|
||||
@@ -62,6 +60,7 @@
|
||||
android:scaleType="center"
|
||||
android:paddingLeft="8dp"
|
||||
android:visibility="gone"
|
||||
android:drawableAlpha="180"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<ProgressBar
|
||||
|
||||
@@ -2639,6 +2639,9 @@
|
||||
<!-- The offset of the baseline within this view. See {see android.view.View#getBaseline}
|
||||
for details -->
|
||||
<attr name="baseline" format="dimension" />
|
||||
<!-- @hide The alpha value (0-255) set on the ImageView's drawable. Equivalent
|
||||
to calling ImageView.setAlpha(int), not the same as View.setAlpha(float). -->
|
||||
<attr name="drawableAlpha" format="integer" />
|
||||
</declare-styleable>
|
||||
<declare-styleable name="ToggleButton">
|
||||
<!-- The text for the button when it is checked. -->
|
||||
|
||||
@@ -230,10 +230,11 @@ please see styles_device_defaults.xml.
|
||||
<style name="TextAppearance.StatusBar.Icon">
|
||||
</style>
|
||||
<style name="TextAppearance.StatusBar.EventContent">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textColor">?android:attr/textColorSecondary</item>
|
||||
<item name="android:textSize">13sp</item>
|
||||
</style>
|
||||
<style name="TextAppearance.StatusBar.EventContent.Title">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user