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

Commit 8601e8b3 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Expand the navbar dead zone briefly after touches elsewhere." into jb-mr1-dev

parents 5b81de4d c26185bb

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

+12 −2
Original line number Diff line number Diff line
@@ -143,8 +143,13 @@ 


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

            android:id="@+id/deadzone"

            android:layout_height="@dimen/navigation_bar_deadzone_size"

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            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"

            android:layout_gravity="top"

            />

    </FrameLayout>
@@ -269,8 +274,13 @@ 


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

            android:id="@+id/deadzone"

            android:layout_height="@dimen/navigation_bar_deadzone_size"

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            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"

            android:layout_gravity="top"

            />

    </FrameLayout>

packages/SystemUI/res/layout/navigation_bar.xml

+13 −3
Original line number Diff line number Diff line
@@ -147,8 +147,13 @@ 


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

            android:id="@+id/deadzone"

            android:layout_height="@dimen/navigation_bar_deadzone_size"

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            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"

            android:layout_gravity="top"

            />

    </FrameLayout>
@@ -276,9 +281,14 @@ 


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

            android:id="@+id/deadzone"

            android:layout_width="@dimen/navigation_bar_deadzone_size"

            android:layout_height="match_parent"

            android:layout_gravity="left"

            android:layout_width="match_parent"

            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"

            android:layout_gravity="top"

            />

    </FrameLayout>

packages/SystemUI/res/values/attrs.xml

+12 −0
Original line number Diff line number Diff line
@@ -35,5 +35,17 @@ 
    <declare-styleable name="RecentsPanelView">

        <attr name="recentItemLayout" format="reference" />

    </declare-styleable>

    <declare-styleable name="DeadZone">

        <attr name="minSize" format="dimension" />

        <attr name="maxSize" format="dimension" />

        <attr name="holdTime" format="integer" />

        <attr name="decayTime" format="integer" />

        <attr name="orientation" />

    </declare-styleable>



    <attr name="orientation">

        <enum name="horizontal" value="0" />

        <enum name="vertical" value="1" />

    </attr>

</resources>

packages/SystemUI/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -72,5 +72,9 @@ 
    <!-- Whether we're using the tablet-optimized recents interface (we use this

     value at runtime for some things) -->

    <integer name="status_bar_recents_bg_gradient_degrees">90</integer>



    <!-- decay duration (from size_max -> size), in ms -->

    <integer name="navigation_bar_deadzone_hold">333</integer>

    <integer name="navigation_bar_deadzone_decay">333</integer>

</resources>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
    <!-- thickness (height) of the dead zone at the top of the navigation bar,

         reducing false presses on navbar buttons; approx 2mm -->

    <dimen name="navigation_bar_deadzone_size">12dp</dimen>

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

    <dimen name="navigation_bar_deadzone_size_max">32dp</dimen>



    <!-- Height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen>