app_Settings

Files

Yohann Roussel 89fea15a84 resolve merge conflicts of 1104b94dbc to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I537fb871134f801ec9489b48fe748b525e5a65ea

2017-06-06 12:06:45 +00:00

AssistGesturePreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

AssistGestureSensitivityPreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

AssistGestureSettingsTest.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00

CameraLiftTriggerPreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

CameraLiftTriggerSettingsTest.java

Added settings UI for camera lift trigger gesture

2017-04-24 14:57:55 -07:00

DoubleTapPowerPreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

DoubleTapPowerSettingsTest.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00

DoubleTapScreenPreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

DoubleTapScreenSettingsTest.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00

DoubleTwistGestureSettingsTest.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00

DoubleTwistPreferenceControllerTest.java

Also update flip camera settings for managed profile.

2017-06-05 16:27:12 -07:00

GesturePreferenceControllerTest.java

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

PIckupGesturePreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

PickupGestureSettingsTest.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00

SwipeToNotificationPreferenceControllerTest.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SwipeToNotificationSettingsTest.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00