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

Commit 59c7d34a authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am eee84b48: am 73b61d67: Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev 

* commit 'eee84b48':
  Move legacy menu key to bottom right on sw600dp.
parents cd9dce52 eee84b48

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

+24 −20
Original line number Diff line number Diff line
@@ -41,17 +41,18 @@ 
            >



            <!-- navigation controls -->

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="1"

                />

            <View

                android:layout_width="48dp"

                android:layout_height="match_parent"

                android:layout_weight="0"

                android:layout_marginLeft="2dp"

                android:visibility="invisible"

                />

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                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_height="match_parent"
@@ -79,21 +80,22 @@ 
                systemui:glowBackground="@drawable/ic_sysbar_highlight"

                android:contentDescription="@string/accessibility_recent"

                />

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="1"

                />

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

                android:layout_width="48dp"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_menu"

                android:layout_marginRight="2dp"

                systemui:keyCode="82"

                android:layout_weight="0"

                android:visibility="invisible"

                android:contentDescription="@string/accessibility_menu"

                systemui:glowBackground="@drawable/ic_sysbar_highlight"

                />

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="1"

                />

        </LinearLayout>



        <!-- lights out layout to match exactly -->
@@ -165,17 +167,18 @@ 
            >



            <!-- navigation controls -->

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="1"

                />

            <View

                android:layout_width="48dp"

                android:layout_height="match_parent"

                android:layout_weight="0"

                android:layout_marginLeft="2dp"

                android:visibility="invisible"

                />

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                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_height="match_parent"
@@ -203,9 +206,15 @@ 
                systemui:glowBackground="@drawable/ic_sysbar_highlight"

                android:contentDescription="@string/accessibility_recent"

                />

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="1"

                />

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

                android:layout_width="48dp"

                android:layout_height="match_parent"

                android:layout_marginRight="2dp"

                android:src="@drawable/ic_sysbar_menu"

                systemui:keyCode="82"

                android:layout_weight="0"
@@ -213,11 +222,6 @@ 
                android:contentDescription="@string/accessibility_menu"

                systemui:glowBackground="@drawable/ic_sysbar_highlight"

                />

            <Space 

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="1"

                />

        </LinearLayout>



        <!-- lights out layout to match exactly -->