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

Commit dfc87c82 authored by Andrew Flynn's avatar Andrew Flynn Committed by Android (Google) Code Review
Browse files

Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop

parents fa71583e 1d9af30b

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

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                android:clipToPadding="false"

                >

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

                    android:layout_width="80dip"

                    android:layout_width="@dimen/navigation_key_width"

                    android:layout_height="match_parent"

                    android:src="@drawable/ic_sysbar_back"

                    systemui:keyCode="4"
@@ -62,7 +62,7 @@ 
                    systemui:glowBackground="@drawable/ic_sysbar_highlight"

                    />

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

                    android:layout_width="80dip"

                    android:layout_width="@dimen/navigation_key_width"

                    android:layout_height="match_parent"

                    android:src="@drawable/ic_sysbar_home"

                    systemui:keyCode="3"
@@ -70,14 +70,14 @@ 
                    systemui:glowBackground="@drawable/ic_sysbar_highlight"

                    />

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

                    android:layout_width="80dip"

                    android:layout_width="@dimen/navigation_key_width"

                    android:layout_height="match_parent"

                    android:src="@drawable/ic_sysbar_recent"

                    android:contentDescription="@string/accessibility_recent"

                    systemui:glowBackground="@drawable/ic_sysbar_highlight"

                    />

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

                    android:layout_width="80dip"

                    android:layout_width="@dimen/navigation_menu_key_width"

                    android:layout_height="match_parent"

                    android:src="@drawable/ic_sysbar_menu"

                    systemui:keyCode="82"

packages/SystemUI/res/layout/navigation_bar.xml

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
                android:visibility="invisible"

                />

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

                android:layout_width="80dp"

                android:layout_width="@dimen/navigation_key_width"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_back"

                systemui:keyCode="4"
@@ -64,7 +64,7 @@ 
                android:visibility="invisible"

                />

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

                android:layout_width="80dp"

                android:layout_width="@dimen/navigation_key_width"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_home"

                systemui:keyCode="3"
@@ -80,7 +80,7 @@ 
                android:visibility="invisible"

                />

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

                android:layout_width="80dp"

                android:layout_width="@dimen/navigation_key_width"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_recent"

                android:layout_weight="0"
@@ -88,7 +88,7 @@ 
                android:contentDescription="@string/accessibility_recent"

                />

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

                android:layout_width="40dp"

                android:layout_width="@dimen/navigation_menu_key_width"

                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_menu"

                systemui:keyCode="82"

packages/SystemUI/res/values-sw600dp-port/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -18,5 +18,11 @@ 
<resources>

    <!-- gap on either side of status bar notification icons -->

    <dimen name="status_bar_icon_padding">0dp</dimen>



    <!-- The width of the view containing non-menu status bar icons -->

    <dimen name="navigation_key_width">70dip</dimen>



    <!-- The width of the view containing the menu status bar icon -->

    <dimen name="navigation_menu_key_width">40dip</dimen>

</resources>

packages/SystemUI/res/values-sw600dp/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -67,4 +67,10 @@ 


    <!-- opacity at which Notification icons will be drawn in the status bar -->

    <item type="dimen" name="status_bar_icon_drawing_alpha">100%</item>



    <!-- The width of the view containing non-menu status bar icons -->

    <dimen name="navigation_key_width">80dip</dimen>



    <!-- The width of the view containing the menu status bar icon -->

    <dimen name="navigation_menu_key_width">40dip</dimen>

</resources>

packages/SystemUI/res/values-sw720dp/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -21,5 +21,11 @@ 


    <!-- opacity at which Notification icons will be drawn in the status bar -->

    <item type="dimen" name="status_bar_icon_drawing_alpha">100%</item>



    <!-- The width of the view containing non-menu status bar icons -->

    <dimen name="navigation_key_width">80dip</dimen>



    <!-- The width of the view containing the menu status bar icon -->

    <dimen name="navigation_menu_key_width">80dip</dimen>

</resources>