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

Commit 37d1d6d0 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Announce navbar buttons when lights-out." into mnc-dev

parents 56b94e15 e36280e3

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

+22 −16
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_back"

                />

            <ImageView

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
@@ -139,6 +140,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_home"

                />

            <ImageView

                android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
@@ -147,6 +149,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_recent"

                />

            <Space

                android:layout_width="match_parent"
@@ -276,6 +279,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_back"

                />

            <ImageView

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
@@ -283,6 +287,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_home"

                />

            <ImageView

                android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
@@ -291,6 +296,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_recent"

                />

            <Space

                android:layout_width="match_parent"

packages/SystemUI/res/layout/navigation_bar.xml

+24 −18
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_back"

                />

            <View

                android:layout_width="match_parent"
@@ -143,6 +144,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_home"

                />

            <View

                android:layout_width="match_parent"
@@ -157,6 +159,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_recent"

                />

        </LinearLayout>
@@ -279,6 +282,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_recent"

                />

            <View

                android:layout_height="match_parent"
@@ -292,6 +296,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_home"

                />

            <View

                android:layout_height="match_parent"
@@ -306,6 +311,7 @@ 
                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:scaleType="center"

                android:layout_weight="0"

                android:contentDescription="@string/accessibility_back"

                />

        </LinearLayout>