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

Commit 58853224 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 7c36dc2d: am 58a69d24: Merge "Fix 6398209: Re-enable vibrate for search gesture." into jb-dev 

* commit '7c36dc2d':
  Fix 6398209: Re-enable vibrate for search gesture.
parents 82832848 7c36dc2d

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />

    <uses-permission android:name="android.permission.MASTER_CLEAR" />

    <uses-permission android:name="android.permission.VIBRATE" />



    <!-- ActivityManager -->

    <uses-permission android:name="android.permission.GET_TASKS" />

packages/SystemUI/res/layout-land/status_bar_search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
                prvandroid:snapMargin="@dimen/navbar_search_snap_margin"

                prvandroid:hitRadius="@dimen/navbar_search_hit_radius"

                prvandroid:feedbackCount="0"

                prvandroid:vibrationDuration="0"

                prvandroid:vibrationDuration="@integer/config_vibration_duration"

                prvandroid:alwaysTrackFinger="true"/>



        </RelativeLayout>

packages/SystemUI/res/layout-port/status_bar_search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
                prvandroid:snapMargin="@dimen/navbar_search_snap_margin"

                prvandroid:hitRadius="@dimen/navbar_search_hit_radius"

                prvandroid:feedbackCount="0"

                prvandroid:vibrationDuration="0"

                prvandroid:vibrationDuration="@integer/config_vibration_duration"

                prvandroid:alwaysTrackFinger="true"/>



        </RelativeLayout>

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
                prvandroid:snapMargin="@dimen/navbar_search_snap_margin"

                prvandroid:hitRadius="@dimen/navbar_search_hit_radius"

                prvandroid:feedbackCount="0"

                prvandroid:vibrationDuration="0"

                prvandroid:vibrationDuration="@integer/config_vibration_duration"

                prvandroid:alwaysTrackFinger="true"/>



        </RelativeLayout>

packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
                prvandroid:snapMargin="@dimen/navbar_search_snap_margin"

                prvandroid:hitRadius="@dimen/navbar_search_hit_radius"

                prvandroid:feedbackCount="0"

                prvandroid:vibrationDuration="0"

                prvandroid:vibrationDuration="@integer/config_vibration_duration"

                prvandroid:alwaysTrackFinger="true"/>



        </RelativeLayout>