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

Commit a2b693db authored by Doris Ling's avatar Doris Ling Committed by Android (Google) Code Review
Browse files

Merge "Update UI for gesture settings." into nyc-mr1-dev

parents 86547c23 d59fcc94

res/layout/gesture_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="16dp"

        android:paddingTop="24dp"

        android:paddingBottom="16dp"

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

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

res/xml/gesture_settings.xml

+6 −6
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
    android:title="@string/gesture_preference_title"

    settings:keywords="@string/keywords_gesture">



    <com.android.settings.gestures.GesturePreference

            android:key="gesture_swipe_down_fingerprint"

            android:title="@string/fingerprint_swipe_for_notifications_title"

            android:summary="@string/fingerprint_swipe_for_notifications_summary"

            settings:animation="@raw/gesture_fingerprint_swipe"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_double_tap_power"

        android:title="@string/double_tap_power_for_camera_title"
@@ -37,10 +43,4 @@ 
        android:summary="@string/ambient_display_summary"

        settings:animation="@raw/gesture_ambient_tap"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_swipe_down_fingerprint"

        android:title="@string/fingerprint_swipe_for_notifications_title"

        android:summary="@string/fingerprint_swipe_for_notifications_summary"

        settings:animation="@raw/gesture_fingerprint_swipe"/>



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/gestures/GesturePreference.java

+0 −2
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ public final class GesturePreference extends SwitchPreference implements 
    @Override

    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        holder.setDividerAllowedAbove(false);

        holder.setDividerAllowedBelow(false);

        final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);

        final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);

        final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);

src/com/android/settings/gestures/GestureSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements 
    }



    private static boolean isSystemUINavigationEnabled(Context context) {

        return Secure.getInt(context.getContentResolver(), Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 1)

        return Secure.getInt(context.getContentResolver(), Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0)

                == 1;

    }