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

Commit 47721fa5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoids vibration over deadzone in navigationbar" into pi-dev

parents 7793bcd8 603b3298

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

+0 −12
Original line number Diff line number Diff line
@@ -41,16 +41,4 @@ 


    </FrameLayout>



    <com.android.systemui.statusbar.policy.DeadZone

        android:id="@+id/deadzone"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:layout_gravity="top"

        systemui:minSize="@dimen/navigation_bar_deadzone_size"

        systemui:maxSize="@dimen/navigation_bar_deadzone_size_max"

        systemui:holdTime="@integer/navigation_bar_deadzone_hold"

        systemui:decayTime="@integer/navigation_bar_deadzone_decay"

        systemui:orientation="horizontal"

        />



</FrameLayout>

packages/SystemUI/res/layout/navigation_layout.xml

+0 −12
Original line number Diff line number Diff line
@@ -46,16 +46,4 @@ 


    </com.android.systemui.statusbar.phone.NearestTouchFrame>



    <com.android.systemui.statusbar.policy.DeadZone

        android:id="@+id/deadzone"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:layout_gravity="top"

        systemui:minSize="@dimen/navigation_bar_deadzone_size"

        systemui:maxSize="@dimen/navigation_bar_deadzone_size_max"

        systemui:holdTime="@integer/navigation_bar_deadzone_hold"

        systemui:decayTime="@integer/navigation_bar_deadzone_decay"

        systemui:orientation="horizontal"

        />



</FrameLayout>

packages/SystemUI/res/layout/navigation_layout_rot90.xml

+0 −12
Original line number Diff line number Diff line
@@ -46,16 +46,4 @@ 


    </com.android.systemui.statusbar.phone.NearestTouchFrame>



    <com.android.systemui.statusbar.policy.DeadZone

        android:id="@+id/deadzone"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:layout_gravity="top"

        systemui:minSize="@dimen/navigation_bar_deadzone_size"

        systemui:maxSize="@dimen/navigation_bar_deadzone_size_max"

        systemui:holdTime="@integer/navigation_bar_deadzone_hold"

        systemui:decayTime="@integer/navigation_bar_deadzone_decay"

        systemui:orientation="vertical"

        />



</FrameLayout>

packages/SystemUI/res/values-land/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -28,4 +28,7 @@ 


    <!-- We have only space for one notification on phone landscape layouts. -->

    <integer name="keyguard_max_notification_count">1</integer>



    <!-- orientation of the dead zone when touches have recently occurred elsewhere on screen -->

    <integer name="navigation_bar_deadzone_orientation">1</integer>

</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -35,4 +35,7 @@ 
    <!-- Animation duration when using long press on recents to dock -->

    <integer name="long_press_dock_anim_duration">290</integer>



    <!-- orientation of the dead zone when touches have recently occurred elsewhere on screen -->

    <integer name="navigation_bar_deadzone_orientation">0</integer>



</resources>