Commit Graph

124 Commits

Author SHA1 Message Date
Andrew Sapperstein
d126c63e22 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f
am: aa661b548b

Change-Id: Ieb0569d46a5f06aa6fd372b685d8f64152d68029
2017-08-02 06:11:53 +00:00
Andrew Sapperstein
9c9549bd29 Refactoring DoubleTwistPreferenceController.
Made the availability and setting logic static so that
it can be invoked without creating a controller.

Bug: 62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
2017-08-01 13:56:51 -07:00
Fan Zhang
eef16a8b0f Disable AssistGestureSetting search if not supported
Change-Id: Id5f79506635592d98783b2b99b7ee09dd223c43c
Fixes: 64066820
Test: robotests
2017-07-31 15:46:46 -07:00
Matthew Fritze
68617a6f42 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
2017-07-27 01:20:02 +00:00
Matthew Fritze
c36ec8e629 Change SwipeForNotification Payload default to Off
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
2017-07-26 12:59:50 -07:00
Doris Ling
9042f822a6 Fix gestures summary text when there is no sensor for assit.
Should exit the summary handling if sensor is not available.

Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests
2017-07-26 11:07:19 -07:00
Matthew Fritze
73056522b3 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes: 63955012
Test: robotests
2017-07-25 14:37:05 -07:00
Matthew Fritze
458bb887e1 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Manual merge for: ag/2588219/

Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes: 63955012
Test: robotests
2017-07-25 10:44:15 -07:00
Kevin Chyn
5e707ccb3d Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev 2017-07-25 05:31:53 +00:00
Kevin Chyn
2a2dcb52cb Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-25 02:33:30 +00:00
TreeHugger Robot
af63fc249e Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev 2017-07-25 02:32:31 +00:00
Kevin Chyn
0d378e04ca Default-off FP Swipe
am: 8f5de15ba1

Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
2017-07-25 01:07:31 +00:00
Kevin Chyn
8f5de15ba1 Default-off FP Swipe
Fixes: 63992836

Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests

Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
2017-07-24 14:00:18 -07:00
Kevin Chyn
82792cc5b3 Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-24 13:40:34 -07:00
Doris Ling
a39daa25e7 Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev 2017-07-21 17:19:12 +00:00
Doris Ling
c84001528c Fix gesture preview image visibility not set correctly.
- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.

Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix: 63783217
Test: make RunSettingsRoboTests
2017-07-20 20:41:43 +00:00
Doris Ling
204ca74397 Move Gesture settings up one level.
Move System->Languages, input & gestures->Gestures to System->Gestures.

Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
(cherry picked from commit 55ce7de7d0)
2017-07-20 16:46:44 +00:00
Matthew Fritze
d88a768152 Add gestures as inline actions for Phone Buddy am: 469e4ea228
am: c44f8c8256

Change-Id: Ic3d11679a7b87c429b3cdb8eeba3c5d208cd5866
2017-07-17 17:48:59 +00:00
Matthew Fritze
469e4ea228 Add gestures as inline actions for Phone Buddy
Add the following gestures as inline:
- Assist gesture
- Double tap power
- Double tap screen
- Pickup
- Swipe for notification

Bug:62022517
Test: make RunSettingsRoboTests
Change-Id: Ib246b97a0b924bf18f464d3548b7e4c393fc1931
2017-07-17 08:48:42 -07:00
Geoffrey Pitsch
8d973761ad Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-12 13:42:34 -04:00
Geoffrey Pitsch
57adc290d2 Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-11 14:05:03 -04:00
Doris Ling
a689787b71 Automatically play the gesture video when the setting is launched.
- and save the video pause state on config change so that the paused
video will not auto start again on screen rotation.

Change-Id: I3f41849ee3063942fb4141e4556e494bc8439226
Fix: 63145847
Test: make RunSettingsRoboTests
2017-07-11 10:38:24 -07:00
Kevin Chyn
74d4547a3f Merge "Fix Assist Gesture settings check" into oc-dr1-dev am: d0487eff5e
am: 6d41ab7958

Change-Id: I6f4bdd8e1f18870c027c578fc9c1a1e4143da7d5
2017-07-07 03:57:30 +00:00
TreeHugger Robot
d0487eff5e Merge "Fix Assist Gesture settings check" into oc-dr1-dev 2017-07-07 03:43:12 +00:00
Daniel Sheng
9a16e473ab Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Daniel Sheng
f8e0963f78 Merge "Added suggestions for gestures." into oc-dr1-dev 2017-07-06 03:19:57 +00:00
Daniel Sheng
11d240c300 Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07:00
Daniel Sheng
f7c459c9e5 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner
Change-Id: I7337a141cb21e5a1399aaca05ec1facd8629577b
Merged-In: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 17:35:03 -07:00
Daniel Sheng
20d5588a27 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner

Change-Id: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 09:05:11 -07:00
Kevin Chyn
8b2304f232 Fix Assist Gesture settings check
Fixes: 63181412

Test: manual
Change-Id: Ie51cc4bb62c68722e4613850bfdb4dc67ae15e77
2017-06-30 22:41:56 -07:00
Kevin Chyn
9fde3fe2ab Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev am: 72a94e9f5a
am: 408efb26f0

Change-Id: I696511821f64f7bc09819cf1d45374125b7905c0
2017-07-01 03:11:52 +00:00
Kevin Chyn
1db30b7749 Assist gesture setting should not be available on unsupported devices
Fixes: 63176246

Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
2017-06-30 16:27:49 -07:00
Kevin Chyn
81031d2467 Assist gesture settings should reflect assistant eligibility/preferences am: 1b44a87987
am: cdcceec0fb

Change-Id: Ia5a061381db8d5e36ce1d31ac89ee2c58af27989
2017-06-28 00:35:32 +00:00
Kevin Chyn
1b44a87987 Assist gesture settings should reflect assistant eligibility/preferences
Fixes: 37707753
Fixes: 62843146

Test: manual testing of settings && make -j RunSettingsRoboTests
Change-Id: I5e606686a03960e5cfe1df2f77c48d6ece9c363a
2017-06-27 15:08:33 -07:00
TreeHugger Robot
63e36128e6 Merge "Fix assist gesture settings summary" into oc-dr1-dev 2017-06-27 03:28:43 +00:00
TreeHugger Robot
58005fc5c1 Merge "Fix assist gesture settings summary" 2017-06-27 01:22:17 +00:00
Kevin Chyn
59f901861b Remove unnecessary functions from AssistGestureFeatureProvider
Fixes: 62945918

Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-26 16:58:43 -07:00
Kevin Chyn
891ab1a713 Fix assist gesture settings summary
Bug: 62841640

Test: make -j RunSettingsRoboTests && manual testing of settings

Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
2017-06-26 13:36:02 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Kevin Chyn
cd236f7e60 Remove unnecessary functions from AssistGestureFeatureProvider
Fixes: 62945918

Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-24 14:16:47 -07:00
Kevin Chyn
a310a50868 Fix assist gesture settings summary
Fixes: 62841640

Test: make -j RunSettingsRoboTests && manual testing of settings

Merged-In: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
2017-06-23 19:58:20 -07:00
Kevin Chyn
f475bc2fbe Move assist gestures settings to overlay
Bug: 37427306

Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
2017-06-13 14:56:43 -07:00
Daniel Sheng
9cdd5d6ea2 Merge "Camera lift settings are now default-on." 2017-06-06 23:26:06 +00:00
Daniel Sheng
dab739acce Camera lift settings are now default-on.
Bug: 62102062
Test: make RunSettingsRoboTests

Changing camera lift trigger setting to default-on.

Change-Id: Id4918ce3ecf82271989741cce54729e8fd49ae52
2017-06-06 14:19:24 -07:00
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
Doris Ling
fed8ea8bce Also update flip camera settings for managed profile.
When user update the setting for flip camera, check if there is managed
profile for the user, and update the setting for the managed user id as
well, so that the work profile camera app can read the correct setting
value.

Change-Id: I757041289329870311bc8473b19fd49ecdd0fadb
Fix: 62078588
Test: make RunSettingsRoboTests
2017-06-05 16:27:12 -07:00
Fan Zhang
179645eecd Add help url placeholders for new pages
Bug: 38412798
Test: visual
Change-Id: I4ede523cb13790ea05309279f80a778b2086f850
2017-06-05 14:50:01 -07:00
Philip Quinn
a0d327a5ac Merge "Add metrics category for the assist gesture settings." 2017-05-25 16:18:54 +00:00
Matthew Fritze
2078bc2358 Remove search2 package and put everything into search
Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b
Fixes: 38502743
Test: make RunSettingsRoboTests
2017-05-23 13:57:28 -07:00
Philip Quinn
6416ad2b40 Add metrics category for the assist gesture settings.
Bug: 38508651
Test: make RunSettingsRoboTests
Change-Id: Ic334f7608546651381cfb7c94ae1f6d77f4939b6
2017-05-23 10:33:09 -07:00