Merge "Added new setting for gestures." into nyc-mr1-dev

                       android:value="com.android.settings.deletionhelper.DeletionHelperFragment" />

        </activity>

        <!-- activity for gesture settings -->

        <activity android:name="Settings$GestureSettingsActivity"

                  android:label="@string/gesture_preference_title"

                  android:icon="@drawable/ic_settings_gestures"

                  android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.device" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.gestures.GestureSettings" />

        </activity>

        <service

            android:name=".SettingsDumpService"

            android:exported="true"

<!--

    Copyright (C) 2016 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorAccent">

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>

</vector>

 No newline at end of file

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:background="?android:attr/activatedBackgroundIndicator"

    android:clipToPadding="false"

    android:orientation="vertical">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="horizontal"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

        <TextView

            android:id="@android:id/title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"/>

        <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="end|center_vertical"/>

    </LinearLayout>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:background="@color/gestures_setting_backgroud_color"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:orientation="horizontal">

        <FrameLayout

            android:layout_width="@dimen/gestures_settings_video_width"

            android:layout_height="@dimen/gestures_settings_video_height">

            <TextureView

                android:id="@+id/gesture_video"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center"/>

            <ImageView

                android:id="@+id/gesture_image"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:visibility="gone"/>

        </FrameLayout>

        <TextView

            android:id="@android:id/summary"

            android:layout_width="@dimen/gestures_settings_summary_width"

            android:layout_height="@dimen/gestures_settings_summary_height"

            android:layout_weight="1"

            android:paddingTop="@dimen/gestures_settings_padding_top_bottom"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:maxLines="10"

            android:ellipsize="end"/>

    </LinearLayout>

</LinearLayout>