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

Commit 0ec8d665 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4913949, 4913979] into pi-qpr1-release 

Change-Id: Ida0d6a734faa333574d13d4319bf149ad9bfa1d7
parents 1853d11d a433d410

packages/SystemUI/res/layout/navigation_layout.xml

+5 −7
Original line number Diff line number Diff line
@@ -18,14 +18,16 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:layout_marginStart="@dimen/rounded_corner_content_padding"

    android:layout_marginEnd="@dimen/rounded_corner_content_padding"

    android:paddingStart="@dimen/nav_content_padding"

    android:paddingEnd="@dimen/nav_content_padding">



    <com.android.systemui.statusbar.phone.NearestTouchFrame

        android:id="@+id/nav_buttons"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="@dimen/rounded_corner_content_padding"

        android:paddingEnd="@dimen/rounded_corner_content_padding"

        android:clipChildren="false"

        android:clipToPadding="false">
@@ -34,8 +36,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            android:paddingStart="@dimen/nav_content_padding"

            android:paddingEnd="@dimen/nav_content_padding"

            android:clipToPadding="false"

            android:clipChildren="false" />
@@ -46,8 +46,6 @@ 
            android:layout_gravity="center"

            android:gravity="center"

            android:orientation="horizontal"

            android:paddingStart="@dimen/nav_content_padding"

            android:paddingEnd="@dimen/nav_content_padding"

            android:clipToPadding="false"

            android:clipChildren="false" />

packages/SystemUI/res/layout/navigation_layout_rot90.xml

+9 −11
Original line number Diff line number Diff line
@@ -18,14 +18,16 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:layout_marginTop="@dimen/rounded_corner_content_padding"

    android:layout_marginBottom="@dimen/rounded_corner_content_padding"

    android:paddingTop="@dimen/nav_content_padding"

    android:paddingBottom="@dimen/nav_content_padding">



    <com.android.systemui.statusbar.phone.NearestTouchFrame

        android:id="@+id/nav_buttons"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingTop="@dimen/rounded_corner_content_padding"

        android:paddingBottom="@dimen/rounded_corner_content_padding"

        android:clipChildren="false"

        android:clipToPadding="false">
@@ -34,10 +36,8 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical"

            android:paddingTop="@dimen/nav_content_padding"

            android:paddingBottom="@dimen/nav_content_padding"

            android:clipChildren="false"

            android:clipToPadding="false" />

            android:clipToPadding="false"

            android:clipChildren="false" />



        <com.android.systemui.statusbar.phone.ReverseLinearLayout

            android:id="@+id/center_group"
@@ -45,10 +45,8 @@ 
            android:layout_height="match_parent"

            android:gravity="center"

            android:orientation="vertical"

            android:paddingTop="@dimen/nav_content_padding"

            android:paddingBottom="@dimen/nav_content_padding"

            android:clipChildren="false"

            android:clipToPadding="false" />

            android:clipToPadding="false"

            android:clipChildren="false" />



    </com.android.systemui.statusbar.phone.NearestTouchFrame>