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

Commit 7a7369a8 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #8058390 Space is required after the battery sign in the RTL... 

Merge "Fix bug #8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev
parents e10837f4 02c40c24

packages/SystemUI/res/layout-land/status_bar_help.xml

+5 −5
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/status_bar_cling"

    android:paddingLeft="40dp"

    android:paddingRight="40dp"

    android:paddingStart="40dp"

    android:paddingEnd="40dp"

    android:background="#DD000000"

    android:focusable="true"

    android:orientation="horizontal"
@@ -34,7 +34,7 @@ 
        android:layout_width="wrap_content"

        android:layout_weight="0"

        android:layout_height="wrap_content"

        android:layout_marginRight="50dp"

        android:layout_marginEnd="50dp"

        android:gravity="center"

        android:src="@drawable/arrow_dashed"

        tools:ignore="ContentDescription" />
@@ -64,8 +64,8 @@ 
            style="@style/ClingButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingLeft="50dp"

            android:paddingRight="50dp"

            android:paddingStart="50dp"

            android:paddingEnd="50dp"

            android:text="@android:string/ok" />

    </LinearLayout>

</LinearLayout>

packages/SystemUI/res/layout-land/status_bar_recent_item.xml

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:paddingLeft="@dimen/status_bar_recents_item_padding"

    android:paddingRight="@dimen/status_bar_recents_item_padding"

    android:paddingStart="@dimen/status_bar_recents_item_padding"

    android:paddingEnd="@dimen/status_bar_recents_item_padding"

    android:importantForAccessibility="no"

    android:clipChildren="false">
@@ -72,7 +72,7 @@ 
            android:fadingEdge="horizontal"

            android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length"

            android:scrollHorizontally="true"

            android:layout_alignLeft="@id/app_thumbnail"

            android:layout_alignStart="@id/app_thumbnail"

            android:layout_below="@id/app_thumbnail"

            android:layout_marginTop="@dimen/status_bar_recents_text_description_padding"

            android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin"

packages/SystemUI/res/layout-land/status_bar_search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            android:id="@+id/search_panel_container"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentRight="true">

            android:layout_alignParentEnd="true">



            <com.android.internal.widget.multiwaveview.GlowPadView

                android:id="@+id/glow_pad_view"

packages/SystemUI/res/layout-sw600dp/navigation_bar.xml

+12 −12
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                android:layout_weight="1"

                />

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"

                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_back"

                systemui:keyCode="4"
@@ -63,7 +63,7 @@ 
                android:contentDescription="@string/accessibility_back"

                />

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"

                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_home"

                systemui:keyCode="3"
@@ -73,7 +73,7 @@ 
                android:contentDescription="@string/accessibility_home"

                />

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"

                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_recent"

                android:layout_weight="0"
@@ -112,7 +112,7 @@ 
                android:layout_weight="1"

                />

            <ImageView

                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"

                android:layout_height="match_parent"

                android:layout_marginStart="40dp"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"
@@ -120,14 +120,14 @@ 
                android:layout_weight="0"

                />

            <ImageView

                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:scaleType="center"

                android:layout_weight="0"

                />

            <ImageView

                android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"

                android:layout_marginEnd="40dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"
@@ -195,7 +195,7 @@ 
                android:layout_weight="1"

                />

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"

                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_back"

                systemui:keyCode="4"
@@ -204,7 +204,7 @@ 
                android:contentDescription="@string/accessibility_back"

                />

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"

                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_home"

                systemui:keyCode="3"
@@ -214,7 +214,7 @@ 
                android:contentDescription="@string/accessibility_home"

                />

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"

                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_recent"

                android:layout_weight="0"
@@ -253,7 +253,7 @@ 
                android:layout_weight="1"

                />

            <ImageView

                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"

                android:layout_height="match_parent"

                android:layout_marginStart="40dp"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"
@@ -261,14 +261,14 @@ 
                android:layout_weight="0"

                />

            <ImageView

                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:scaleType="center"

                android:layout_weight="0"

                />

            <ImageView

                android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"

                android:layout_marginEnd="40dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"

packages/SystemUI/res/layout/compat_mode_help.xml

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
        android:background="@drawable/compat_mode_help_divider_bottom"

        android:layout_marginBottom="55dp"

        android:layout_marginEnd="80dp"

        android:layout_alignLeft="@id/header"

        android:layout_alignStart="@id/header"

        android:layout_alignParentBottom="true"

        >

        <ImageView
@@ -82,7 +82,7 @@ 
        android:id="@+id/button"

        android:layout_width="208dp"

        android:layout_height="48dp"

        android:layout_alignLeft="@id/header"

        android:layout_alignStart="@id/header"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="20dp"

        android:textSize="28sp"