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

Commit 1fad16a6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 

* commit '3757e234':
  Fix baseline alignment of notification times.
parents bc36b523 3757e234

core/res/res/layout/notification_template_base.xml

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
            <ViewStub android:id="@+id/time"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_weight="0"

                android:visibility="gone"

                android:layout="@layout/notification_template_part_time"
@@ -69,7 +68,6 @@ 
            <ViewStub android:id="@+id/chronometer"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_weight="0"

                android:visibility="gone"

                android:layout="@layout/notification_template_part_chronometer"

core/res/res/layout/notification_template_big_base.xml

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
                <ViewStub android:id="@+id/time"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_time"
@@ -74,7 +73,6 @@ 
                <ViewStub android:id="@+id/chronometer"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_chronometer"

core/res/res/layout/notification_template_big_text.xml

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
                <ViewStub android:id="@+id/time"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_time"
@@ -76,7 +75,6 @@ 
                <ViewStub android:id="@+id/chronometer"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_chronometer"

core/res/res/layout/notification_template_inbox.xml

+0 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 
                <ViewStub android:id="@+id/time"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_time"
@@ -77,7 +76,6 @@ 
                <ViewStub android:id="@+id/chronometer"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_chronometer"