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

Commit cc30711d authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge "Touchpad: replace references to "trackpad" with "touchpad"" into main

parents e28dcd02 509fd175

res/layout/trackpad_gesture_preview.xml→res/layout/touchpad_gesture_preview.xml

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<LinearLayout

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

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

    android:background="@drawable/trackpad_gesture_dialog_bg"

    android:background="@drawable/touchpad_gesture_dialog_bg"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">
@@ -46,7 +46,7 @@ 
            android:layout_alignParentStart="true"

            android:paddingVertical="14dp"

            android:drawablePadding="9dp"

            style="@style/TrackpadButtonCancel"

            style="@style/TouchpadButtonCancel"

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

            android:text="@string/gesture_button_skip"/>
@@ -60,7 +60,7 @@ 
            android:layout_alignParentStart="true"

            android:paddingVertical="14dp"

            android:drawablePadding="9dp"

            style="@style/TrackpadButtonCancel"

            style="@style/TouchpadButtonCancel"

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

            android:text="@string/gesture_button_restart"/>
@@ -81,7 +81,7 @@ 
            android:layout_alignParentEnd="true"

            android:paddingVertical="14dp"

            android:drawablePadding="9dp"

            style="@style/TrackpadButtonDone"

            style="@style/TouchpadButtonDone"

            android:textColor="@androidprv:color/materialColorOnPrimary"

            android:text="@string/gesture_button_next"/>
@@ -95,7 +95,7 @@ 
            android:layout_alignParentEnd="true"

            android:paddingVertical="14dp"

            android:drawablePadding="9dp"

            style="@style/TrackpadButtonDone"

            style="@style/TouchpadButtonDone"

            android:textColor="@androidprv:color/materialColorOnPrimary"

            android:text="@string/gesture_button_done"/>

    </RelativeLayout>