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

Merge "Fixed the progress bar positioning when expanded" into oc-mr1-dev

Browse Source
This commit is contained in:
Selim Cinek
2017-08-24 23:22:53 +00:00
committed by Android (Google) Code Review
parent d3428e9a3b f0a2083347
commit 4335a043bf
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/layout/notification_template_material_big_picture.xml
View File

@@ -40,7 +40,10 @@
android:layout_marginEnd="@dimen/notification_content_margin_end"
android:orientation="vertical">
<include layout="@layout/notification_template_part_line1"/>
<include layout="@layout/notification_template_progress"/>
<include layout="@layout/notification_template_progress"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_progress_bar_height"
android:layout_marginTop="@dimen/notification_progress_margin_top"/>
<include layout="@layout/notification_template_text"/>
</LinearLayout>
<ImageView

6
core/res/res/layout/notification_template_material_big_text.xml
View File

@@ -45,7 +45,11 @@
android:orientation="vertical"
>
<include layout="@layout/notification_template_part_line1" />
<include layout="@layout/notification_template_progress" />
<include layout="@layout/notification_template_progress"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_progress_bar_height"
android:layout_marginTop="@dimen/notification_progress_margin_top"
android:layout_marginBottom="6dp"/>
<com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"

5
core/res/res/layout/notification_template_material_inbox.xml
View File

@@ -48,8 +48,9 @@
android:layout_height="wrap_content" />
<include layout="@layout/notification_template_progress"
android:layout_width="match_parent"
android:layout_height="15dp"
android:layout_marginTop="4dp"/>
android:layout_height="@dimen/notification_progress_bar_height"
android:layout_marginTop="@dimen/notification_progress_margin_top"
android:layout_marginBottom="2dp"/>
<TextView android:id="@+id/inbox_text0"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"