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

Commit 8507d98a authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix jittery action bar during transitions" into nyc-dev

parents 26e864c3 f852a42b

core/java/android/app/Notification.java

+4 −0
Original line number Diff line number Diff line
@@ -3405,6 +3405,8 @@ public class Notification implements Parcelable 
            big.setTextViewText(R.id.notification_material_reply_text_2, null);

            big.setViewVisibility(R.id.notification_material_reply_text_3, View.GONE);

            big.setTextViewText(R.id.notification_material_reply_text_3, null);



            big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target, 0);

        }



        private RemoteViews applyStandardTemplateWithActions(int layoutId) {
@@ -3427,6 +3429,8 @@ public class Notification implements Parcelable 
            if (N > 0) {

                big.setViewVisibility(R.id.actions_container, View.VISIBLE);

                big.setViewVisibility(R.id.actions, View.VISIBLE);

                big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target,

                        R.dimen.notification_action_list_height);

                if (N>MAX_ACTION_BUTTONS) N=MAX_ACTION_BUTTONS;

                for (int i=0; i<N; i++) {

                    Action action = mActions.get(i);

core/res/res/layout/notification_material_action_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/actions_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:layout_gravity="bottom">

    <com.android.internal.widget.NotificationActionListLayout

            android:id="@+id/actions"

            android:layout_width="match_parent"

core/res/res/layout/notification_template_material_big_base.xml

+39 −33
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<LinearLayout

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"
@@ -22,12 +22,17 @@ 
    android:orientation="vertical"

    android:tag="big"

    >

    <LinearLayout

            android:id="@+id/notification_action_list_margin_target"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/notification_action_list_height"

            android:orientation="vertical"

            >

        <FrameLayout

        android:id="@+id/status_bar_latest_event_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="top"

        android:tag="base"

            >

            <include layout="@layout/notification_template_header" />

            <LinearLayout
@@ -60,5 +65,6 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

        />

    <include layout="@layout/notification_material_action_list" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

</FrameLayout>

core/res/res/layout/notification_template_material_big_picture.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:clipToPadding="false"

            android:orientation="vertical"

            android:id="@+id/notification_action_list_margin_target"

            >

        <LinearLayout

            android:id="@+id/notification_main_column"
@@ -60,6 +61,6 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />

        <include layout="@layout/notification_material_action_list" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

</FrameLayout>

core/res/res/layout/notification_template_material_big_text.xml

+3 −1
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ 
    <include layout="@layout/notification_template_header" />



    <LinearLayout

            android:id="@+id/notification_action_list_margin_target"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="top"

            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:layout_marginBottom="@dimen/notification_action_list_height"

            android:clipToPadding="false"

            android:orientation="vertical">
@@ -61,7 +63,7 @@ 
                android:id="@+id/notification_material_reply_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

        <include layout="@layout/notification_material_action_list" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

    <include layout="@layout/notification_template_right_icon" />

</FrameLayout>