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

This commit is contained in:
Harry Cutts
2025-01-08 07:39:51 -08:00
committed by Android (Google) Code Review
22 changed files with 77 additions and 79 deletions

View File

@@ -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>