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

Commit 66e207ec authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev

parents f1489c75 02a7b78e

core/res/res/layout/screen_action_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ This is an optimized layout for a screen with the Action Bar enabled. 
        android:layout_alignParentTop="true"

        style="?attr/actionBarStyle"

        android:transitionName="android:action_bar"

        android:touchscreenBlocksFocus="true"

        android:gravity="top">

        <com.android.internal.widget.ActionBarView

            android:id="@+id/action_bar"
@@ -53,5 +54,6 @@ This is an optimized layout for a screen with the Action Bar enabled. 
                  android:layout_height="wrap_content"

                  style="?attr/actionBarSplitStyle"

                  android:visibility="gone"

                  android:touchscreenBlocksFocus="true"

                  android:gravity="center"/>

</com.android.internal.widget.ActionBarOverlayLayout>

core/res/res/layout/screen_toolbar.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ This is an optimized layout for a screen with a toolbar enabled. 
        android:layout_alignParentTop="true"

        style="?attr/actionBarStyle"

        android:transitionName="android:action_bar"

        android:touchscreenBlocksFocus="true"

        android:gravity="top">

        <Toolbar

            android:id="@+id/action_bar"

core/res/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -1203,6 +1203,7 @@ please see styles_device_defaults.xml. 
        <item name="navigationButtonStyle">@style/Widget.Toolbar.Button.Navigation</item>

        <item name="collapseIcon">?attr/homeAsUpIndicator</item>

        <item name="contentInsetStart">16dp</item>

        <item name="touchscreenBlocksFocus">true</item>

    </style>



    <style name="Widget.Toolbar.Button.Navigation" parent="Widget">