Merge "Integrate UI with APIs for trackpad settgins."
This commit is contained in:
@@ -24,39 +24,45 @@
|
||||
android:title="@string/trackpad_go_back_title"
|
||||
android:summary="@string/trackpad_go_back_summary"
|
||||
android:icon="@drawable/ic_trackpad_gesture_back"
|
||||
android:order="10"/>
|
||||
android:order="10"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadGoBackPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="gesture_go_home"
|
||||
android:title="@string/trackpad_go_home_title"
|
||||
android:summary="@string/trackpad_go_home_summary"
|
||||
android:icon="@drawable/ic_trackpad_gesture_home"
|
||||
android:order="20"/>
|
||||
android:order="20"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadGoHomePreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="gesture_recent_apps"
|
||||
android:title="@string/trackpad_recent_apps_title"
|
||||
android:summary="@string/trackpad_recent_apps_summary"
|
||||
android:icon="@drawable/ic_trackpad_gesture_recent_apps"
|
||||
android:order="30"/>
|
||||
android:order="30"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadRecentAppsPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="gesture_notifications"
|
||||
android:title="@string/trackpad_notifications_title"
|
||||
android:summary="@string/trackpad_notifications_summary"
|
||||
android:icon="@drawable/ic_trackpad_gesture_notifications"
|
||||
android:order="40"/>
|
||||
android:order="40"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadNotificationsPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="gesture_switch_apps"
|
||||
android:title="@string/trackpad_switch_apps_title"
|
||||
android:summary="@string/trackpad_switch_apps_summary"
|
||||
android:icon="@drawable/ic_trackpad_gesture_switch_apps"
|
||||
android:order="50"/>
|
||||
android:order="50"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadSwitchAppsPreferenceController"/>
|
||||
|
||||
<com.android.settingslib.widget.ButtonPreference
|
||||
android:key="trackpad_touch_gesture_developer_mode"
|
||||
android:title="@string/trackpad_touch_gesture"
|
||||
android:icon="@drawable/ic_trackpad_touch_gestures_inverse"
|
||||
android:order="100"
|
||||
settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
|
||||
</PreferenceScreen>
|
@@ -32,6 +32,7 @@
|
||||
android:key="trackpad_tap_to_click"
|
||||
android:title="@string/trackpad_tap_to_click"
|
||||
android:icon="@drawable/ic_trackpad_tap_to_click"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadTapToClickPreferenceController"
|
||||
android:order="10"/>
|
||||
|
||||
<SwitchPreference
|
||||
@@ -39,6 +40,7 @@
|
||||
android:title="@string/trackpad_reverse_scrolling_title"
|
||||
android:summary="@string/trackpad_reverse_scrolling_summary"
|
||||
android:icon="@drawable/ic_trackpad_reverse_scrolling"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadReverseScrollingPreferenceController"
|
||||
android:order="20"/>
|
||||
|
||||
<SwitchPreference
|
||||
@@ -46,6 +48,7 @@
|
||||
android:title="@string/trackpad_bottom_right_tap_title"
|
||||
android:summary="@string/trackpad_bottom_right_tap_summary"
|
||||
android:icon="@drawable/ic_trackpad_reverse_scrolling"
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadBottomPreferenceController"
|
||||
android:order="30"/>
|
||||
|
||||
<com.android.settings.widget.SeekBarPreference
|
||||
@@ -54,9 +57,7 @@
|
||||
android:icon="@drawable/ic_trackpad_pointer_speed"
|
||||
android:order="40"
|
||||
android:selectable="false"
|
||||
android:max="100"
|
||||
android:min="0"
|
||||
android:defaultValue="50"/>
|
||||
settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>
|
||||
|
||||
<com.android.settingslib.widget.ButtonPreference
|
||||
android:key="trackpad_touch_gesture"
|
||||
|
Reference in New Issue
Block a user