Commit Graph

118 Commits

Author SHA1 Message Date
Fan Zhang
57f18af554 Remove on/off subtext from gesture preferencecontrollers
The toggle switch next to the subtitle already shows on/off clearly.

Fixes: 130652619
Fixes: 130652843
Fixes: 130653459
Fixes: 130653297
Test: robo
Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
2019-04-17 23:49:25 +00:00
Yi-Ling Chuang
17afd6633a Correct the state when prevent ringing page is launched.
When prevent ringing page is opened, the switch gets checked and is set
to vibrate in default. Make it set to a correct state based on the value
stored in Settings.Secure.VOLUME_HUSH_GESTURE.

Fixes: 129728579
Test: robotests
Change-Id: I1063db9fe79800eb2e400810e2414ee650076ea0
2019-04-10 17:28:36 +08:00
Winson Chung
d16e3233af Updating settings to use resource overlay instead of setting.
Bug: 127366543
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest

Change-Id: I021d05a21e00136c6f3651247964319274bdab91
2019-03-25 00:26:39 -07:00
Beverly
efd88a9a7c Move WakeScreenGesturePrefController
Test: n/a
Bug: 127955764
Change-Id: Ib4ca072e1ade3d2c0fd015e25d95807d8804d74d
2019-03-21 10:13:19 -04:00
Beverly
575a856709 Move WakeGestureScreenGestureSettings
Test: robosettings tests
Bug: 127955764
Change-Id: I058a960d6e51afd6e92b9a035993f6bfd91025b8
2019-03-15 09:34:05 -04:00
Mehdi Alizadeh
43502549a3 Adds Edge to Edge option in gesture settings page
Bug: 125489141
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest
Change-Id: I1b274cc053de8235d0c664150cabe5dadc618419
2019-03-07 14:50:27 -08:00
Issei Suzuki
1ac14708e8 Merge "Move AmbientDisplayConfiguration class out of internal package." 2019-02-27 14:28:36 +00:00
Issei Suzuki
fd85a9fae6 Move AmbientDisplayConfiguration class out of internal package.
Test: m droid (run full build)
Bug: 126327497
Change-Id: Idc07c811864edb4f88151051e25d6e05e4caf3b2
2019-02-27 13:25:15 +01:00
Beverly
986f2ecc55 Make PreventRingingSwitch preference clickable
- Talk back says the preference is clickable

Test: make ROBOTEST_FILTER=PreventRingingSwitchPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 124827588
Change-Id: Ia409bbc6516f6aa11975726691131f1fad1518fd
2019-02-25 16:36:45 -05:00
Lucas Dupin
862aaed38c Make WakeScreen conditionally avaialable
Also moving the setting closer to 'Always On'

Fixes: 124389844
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceController
Change-Id: Ic19e01bf4259608dc0430507fbb3ce5ebf6fa456
2019-02-13 13:39:28 -08:00
Lucas Dupin
b55e5f1360 Consolidate wake-screen settings page
UX decided to have a single settings page instead of two

Test: manual
Bug: 111414690
Change-Id: I8e0eee3ea00b1eb9cbe534cc60bfccec43cf8e31
2019-01-30 15:06:14 -08:00
Beverly Tai
77a586bb76 Revert "Settings for skip and silence gestures"
This reverts commit d5428a5cd4.
Test: manual, builds
Reason for revert: moving to SettingsGoogle

Change-Id: Iad954e22c9484c2bc059b52e5f17a244be461394
2019-01-28 19:23:02 -05:00
Lucas Dupin
dbaa5459b8 Merge "Tap gesture settings" 2019-01-17 02:38:09 +00:00
Beverly
d5428a5cd4 Settings for skip and silence gestures
Test: make RunSettingsRoboTests
Bug: 118388808
Change-Id: Ic906b42476283d245b423ef8842b6818cf7893a5
2019-01-16 15:37:47 -05:00
Lucas Dupin
97b8aae933 Tap gesture settings
Tap setting is similar to double tap, it will wake-up the phone
when invoked. This setting page allows for configuration since both
gestures aren't mutually exclusive.

Change-Id: Ia62a1fafcc108e3c0b14613cb30224eae7b35f6a
Fixes: 121198822
Test: make RunSettingsRoboTests
2019-01-16 11:41:44 -08:00
Beverly
8b4d3c3f0c Prevent ringing gesture uses master switch
Test: make ROBOTEST_FILTER=PreventRingingGesturePreferenceControllerTest RunSettingsRoboTests
Test: make ROBOTEST_FILTER=PreventRingingSwitchPreferenceControllerTest RunSettingsRoboTests
Change-Id: Iaf356ccd3623e67c39810955093fc353ae0d10a0
Fixes: 119787033
2019-01-03 12:56:13 -05:00
Lucas Dupin
1e971fe9be Renamed method
Test: make
Bug: 111405682
Change-Id: If3e48c5ee5f90aefb2795ce31025fabec689e7ad
2018-12-26 14:11:41 -08:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Stanley Wang
9c4e2d6767 Fix top level "Gestures" not appearing in search result
If the availability status equals AVAILABLE_UNSEARCHABLE,
the preference won't appear in the serch result so we change
the status to AVAILABLE.

Change-Id: Id3ab28c4974f42be9b06a58d9c0d284f23ef160f
Fixes: 117951603
Test: manual and robotests
2018-12-03 11:28:39 +08:00
Beverly
c1fd6dc5a3 Use inline radio buttons for Prevent Ringing
Test: atest PreventRingingGesturePreferenceControllerTest
Fixes: 79867902

Change-Id: I3c9f949e038bba98e5be972adc01f35f5513432a
2018-11-06 10:12:08 -05:00
Fan Zhang
cdf284b732 Make Settings robotest work with tot Robolectric
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2018-10-31 17:59:17 -07:00
Lucas Dupin
8e57afb2cb Wake screen gesture
Settings page for gesture that allows the display to wake up.
Can be configured via overlays using config_dozeWakeScreenSensorType

Bug: 111414690
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGestureSettingsTest
Change-Id: Ic44f0ee9e781bda3b06cf4896217b324b9e3606c
2018-09-28 16:25:47 -07:00
Lucas Dupin
ade9180e7b Renaming gesture
Bug: 111414690
Test: manual
Test: ReachGesturePreferenceControllerTest, ReachGestureSettingsTest
Change-Id: I34cd4aacabc912122c553bf9c955a8ca4494230b
2018-09-28 12:53:12 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Lucas Dupin
1dfb9421b4 Add 'Reach to check' to lock screen settings
Also added to Gestures page to make sure we're following the
same structure for all gestures.

Change-Id: Iaa9e53e870165801decfa427441d01ee69bcce6d
Note: using dummy video. dependency on b/112442049
Bug: 111414690
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ReachGesturePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ReachGestureSettings
2018-08-14 14:21:57 -07:00
Lucas Dupin
3f773b3be3 Always enable double tap and pick up gestures
Both gestures should also work when AOD is on.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=DoubleTapScreenPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PickupGesturePreferenceControllerTest
Test: manual
Bug: 111414690
Change-Id: I6552b6b6581a942dbc54f5320dda102c2ac62517
2018-08-10 13:43:57 -07:00
Fan Zhang
7431c91de6 Remove search indexing pipeline from Settings
Index is already handled by SettingsIntelligenec. No longer needed in
Settings.

Change-Id: Id43fb3100dc2759185744441cff8cb9cd2d2da20
Fixes: 69808376
Test: robotests
2018-06-21 09:38:36 -07:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Fan Zhang
877fcd8013 Suppress some gesture search when there is no hardware
Change-Id: I780fe337da25d144b6966a098e95de52b1513e39
Fixes: 110250839
Test: robotests
2018-06-18 13:58:31 -07:00
Beverly
756e3b6caf Add summary to PreventRingingParent
Parent preference previously didn't have a summary
Moved summary test to PreventRingingParentPreferenceControllerTest

Test: PreventRingingParentPreferenceControllerTest.java
Change-Id: I2891e1ccffc4ea8007c8bd25689f242ee34c652c
2018-06-11 10:45:34 -04:00
Fan Zhang
752350c8d8 Suppress prevent ringer gesture parent page in search.
The full page verion of prevent ringing is still searchable.

- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
  override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.

Fixes: 72748524
Test: existing robotests for PreventRingingPreferenceController

Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
2018-06-05 15:10:45 -07:00
Matthew Fritze
bf1f5b5813 Add isSliceable API to BasePrefController
Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.

Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.

Test: robotests
Bug: 79779103
Change-Id: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
2018-05-22 11:06:42 -07:00
Matthew Fritze
f59a77ca23 Fix availability status for AOD gestures
Double tap screen to wake and lift to check phone
are dependent on AOD - and should return DISABLED DEPENDENT
SETTING when AOD is turned on.

Test: robotests
Change-Id: Ib246070ee853185459628b2584ddbae72e15a2f8
2018-05-21 15:41:39 -07:00
Mehdi Alizadeh
6ed77203e8 Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: 9a93a1dbe9
am: 84586334b2

Change-Id: Ic2818dc965defb3b2df3192604cedbfcddf36714
2018-05-16 16:53:44 -07:00
Mehdi Alizadeh
5ab8077f44 Adds two overlay settings fields for Swipe Up gesture
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.

Bug: 78908915
Bug: 78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
2018-05-16 11:54:27 -07:00
Mehdi Alizadeh
7c69ec7cfe Moves Swipe Up overlay from Settings app to android.internal
Bug: 79778025
Test: Robo tests
Change-Id: I0cfe5876c5d15552bd4a8e6a96931056846c880d
2018-05-15 18:11:32 -07:00
Doris Ling
56df32dc0b Merge "Map the new category keys to the corresponding fragment." into pi-dev am: be5fa599be
am: b04528670b

Change-Id: I44e1cc9b2e631b19bb51079230821d5e59f496ec
2018-05-10 18:14:54 -07:00
Doris Ling
24827a1c7b Map the new category keys to the corresponding fragment.
- map category night_light to NightDisplaySettings
- map category gestures to GestureSettings

Bug: 79530682
Bug: 79532703
Test: make RunSettingsRoboTests
Change-Id: Idc45957d2515e148226897f58fcc358a8c7f37dd
2018-05-10 13:51:28 -07:00
Mehdi Alizadeh
c93a97d9d5 Adds two overlay settings fields for Swipe Up gesture
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.

Bug: 78908915
Bug: 78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
2018-05-09 18:44:42 -07:00
Matthew Fritze
bd376296cd Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.

The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.

Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.

Bug: 78910582
Fixes: 79245656
Test: robotests
Change-Id: I42c2cedab66be2d76999795f46470a079cc1ec71
Merged-In: I58821a6cfd6134b3b351657b6edf5f74ead00643
2018-05-09 10:03:40 -07:00
Matthew Fritze
f87a1f3f41 Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.

The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.

Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.

Bug: 78910582
Bug: 79245656
Test: robotests
Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643
2018-05-09 08:36:59 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Mehdi Alizadeh
e848603807 Remove swipe up setting page if the feature is not available
Bug: 77974864
Test: Manual test and RoboTests
Change-Id: Ie23a01f254d65e5888f91b5b1cb80df40976c569
2018-04-17 02:14:48 +00:00
Mehdi Alizadeh
cb5899f72e Merge "Adds the Swipe Up settings page under gestures" into pi-dev 2018-04-11 19:07:31 +00:00
Mehdi Alizadeh
528fe0ca14 Adds the Swipe Up settings page under gestures
The illusteration video is not included yet.

Merged-In: I7f2b2f3251a795dfd74dbbb442692e42a5a2966e
Bug: 77549883
Test: Unit tests and Manual test
Change-Id: I04f01f0814f16e4e006291e61ddb07cea8e7c0d6
2018-04-11 11:03:06 -07:00
Julia Reynolds
584aba1f2b Prevent ringing updates
- Add video
- Update text
- Link from Sound settings
- Inherit from BasePreferenceController

Test: make -j RunSettingsRoboTests
Change-Id: If8cd9efd4e6034e6f6864a142a86cbc23bf59dc3
Fixes: 76832936
Fixes: 74410634
2018-04-10 17:32:06 -04:00
HJ ChangLiao
3c4c3fc5c7 GesturesSettingPreferenceController to Toggle
Convert GesturesSettingPreferenceController to
TogglePreferenceController,
All of its children need follow the change,
add setter and robotest for them:
AssistGestureSettingsPreferenceController
DoubleTapPowerPreferenceController
DoubleTapScreenPreferenceController
DoubleTwistPreferenceController
PickupGesturePreferenceController
SwipeToNotificationPreferenceController

Change-Id: I792b2d370eea828bf345fb2b1cc3eac260eb66f4
Merged-In: I792b2d370eea828bf345fb2b1cc3eac260eb66f4
Fixes: 74913806
Fixes: 67998110
Fixes: 67998098
Fixes: 67998048
Fixes: 67998069
Fixes: 67997452
Test: make RunSettingsRoboTests
2018-04-09 09:08:41 +00:00
Julia Reynolds
15dfbbec06 Add a setting for the volume hush gesture
Bug: 75252670
Test: make -j20 RunSettingsRoboTests
Change-Id: I699aeec54eb516931b6d7c5b3fc864b169015c2f
2018-03-21 15:27:54 -04:00
James Lemieux
22a39c2b93 Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
2018-03-04 03:50:08 -08:00
Fan Zhang
906572b127 Change PreferenceController#getSummary return type.
Return CharSequence instead of String.

All user visible string should be modeled as CharSequence.

Bug: 73950519
Test: robotest
Change-Id: I30befef0c33f94351d4a2774e283bd1ed804aa8b
2018-02-27 22:30:12 -08:00