Todd Kennedy
4fa4eeb675
Merge "OMS: rebase settings when overlays update" into pi-dev am: 203b7b1792
...
am: 45d58cab2c
2018-05-11 11:53:09 -07:00
Todd Kennedy
45d58cab2c
Merge "OMS: rebase settings when overlays update" into pi-dev
...
am: 203b7b1792
2018-05-11 11:00:07 -07:00
Todd Kennedy
203b7b1792
Merge "OMS: rebase settings when overlays update" into pi-dev
2018-05-11 17:44:53 +00:00
timhypeng
b02c4a18fc
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev am: 4017944d17
...
am: fe323a7359
2018-05-11 10:32:40 -07:00
timhypeng
fe323a7359
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
...
am: 4017944d17
2018-05-11 10:21:55 -07:00
TreeHugger Robot
4017944d17
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
2018-05-11 17:02:08 +00:00
AL Ho
ae2893db10
Update Accessibility vibration settings.
...
- Get notification vibration and haptic feedback intensity respectively.
- Use xliffs to compose these strings.
- Use the version that passed in Vibrator.class to get Vibrator
instance.
- Refactor switch/case part in getSummary() of
VibrationIntensityPreferenceController.
Let AccessibilitySettings and VibrationIntensityPreferenceController
both call it.
- Add robolectric test for method: updateVibrationSummary().
- Refine test method, use real preference and test summary value.
- Remove redundancy.
Bug: 75322064
Test: make ROBOTEST_FILTER=AccessibilitySettingsTest RunSettingsRoboTests
Change-Id: Ia3c7447b1ab1e336b36ad439800b673821417e48
Merged-In: Ia3c7447b1ab1e336b36ad439800b673821417e48
2018-05-11 08:56:13 +00:00
AL HO
bf180cd6a9
[automerger skipped] Merge "Update Accessbility vibration settings." into pi-dev am: 204dcfdb4c
...
am: d507ddd71c
2018-05-11 00:55:53 -07:00
AL HO
d507ddd71c
Merge "Update Accessbility vibration settings." into pi-dev
...
am: 204dcfdb4c
2018-05-11 00:23:51 -07:00
AL HO
204dcfdb4c
Merge "Update Accessbility vibration settings." into pi-dev
2018-05-11 07:11:14 +00:00
timhypeng
86b5ade6e2
Add discoverable footer preference string when bluetooth is off
...
Bug: 79294219
Test: build pass
Change-Id: Iea8c75bed099466060405d81b793404619059642
2018-05-11 14:16:35 +08:00
Fan Zhang
446b699fc3
[automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev am: 9e629edb09
...
am: b76c1ba682
2018-05-10 23:04:02 -07:00
Fan Zhang
b76c1ba682
Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
...
am: 9e629edb09
2018-05-10 22:59:31 -07:00
TreeHugger Robot
9e629edb09
Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
2018-05-11 05:49:29 +00:00
TreeHugger Robot
8c71d3853f
Merge "Fix a strict mode violation in SystemUpdatePrefController"
2018-05-11 04:46:53 +00:00
hughchen
0e5935f4d6
Merge "Add Pair new device on Bluetooth screen" into pi-dev am: b87eb6aa06
...
am: c183f43dfe
2018-05-10 21:25:34 -07:00
hughchen
c183f43dfe
Merge "Add Pair new device on Bluetooth screen" into pi-dev
...
am: b87eb6aa06
2018-05-10 21:20:59 -07:00
TreeHugger Robot
b87eb6aa06
Merge "Add “Pair new device” on Bluetooth screen" into pi-dev
2018-05-11 04:12:53 +00:00
Fan Zhang
93d3b5174d
Fix a strict mode violation in SystemUpdatePrefController
...
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Bug: 78626509
Test: robotests
2018-05-11 03:45:48 +00:00
AL Ho
92216ae148
Update Accessbility vibration settings.
...
- Get notification vibration and haptic feedback intensity repectively.
- Use xliffs to compose these strings.
- Use the version that passed in Vibrator.class to get Vibrator
instance.
- Refactor switch/case part in getSummary() of
VibrationIntensityPreferenceController.
Let AccessibilitySettings and VibrationIntensityPreferenceController
both call it.
- Add robolectric test for method: updateVibrationSummary().
- Refine test method, use real preference and test summary value.
- Remove redundancy.
Bug: 75322064
Test: make ROBOTEST_FILTER=AccessibilitySettingsTest RunSettingsRoboTests
Change-Id: Ia3c7447b1ab1e336b36ad439800b673821417e48
Merged-In: Ia3c7447b1ab1e336b36ad439800b673821417e48
2018-05-11 11:13:25 +08:00
hughchen
15c7f76101
Add “Pair new device” on Bluetooth screen
...
* Add AddDevicePreferenceController in bluetooth_screen.xml
Bug: 79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I4e43e31d05c297ca206cd2b0f747bb615c3dfcd4
2018-05-11 10:25:46 +08:00
Lei Yu
90e7041170
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev am: b98039e263
...
am: 5740dd8604
2018-05-10 18:26:48 -07:00
Doris Ling
56df32dc0b
Merge "Map the new category keys to the corresponding fragment." into pi-dev am: be5fa599be
...
am: b04528670b
2018-05-10 18:14:54 -07:00
Lei Yu
8dc15da1e0
Merge "Add help uri for smart battery page" into pi-dev am: 64135745b9
...
am: ae09975605
2018-05-10 18:14:00 -07:00
Lei Yu
5740dd8604
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
...
am: b98039e263
2018-05-10 18:05:59 -07:00
Doris Ling
b04528670b
Merge "Map the new category keys to the corresponding fragment." into pi-dev
...
am: be5fa599be
2018-05-10 18:03:05 -07:00
Fan Zhang
4e24b3ffde
[automerger skipped] Merge "Remove search option in Magnification settings" into pi-dev am: f9b93310c5
...
am: ecd3b2da54
2018-05-10 18:02:38 -07:00
Lei Yu
b98039e263
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
2018-05-11 00:49:22 +00:00
TreeHugger Robot
be5fa599be
Merge "Map the new category keys to the corresponding fragment." into pi-dev
2018-05-11 00:46:42 +00:00
Fan Zhang
bfeee279a8
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev am: 4d6375e052
...
am: baab651901
2018-05-10 17:44:42 -07:00
Lei Yu
ae09975605
Merge "Add help uri for smart battery page" into pi-dev
...
am: 64135745b9
2018-05-10 17:34:01 -07:00
Fan Zhang
4ca363470b
Fix a strict mode violation in SystemUpdatePrefController
...
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Merged-In: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Fixes: 78626509
Test: robotests
2018-05-11 00:32:01 +00:00
Lei Yu
1ac4967311
Merge "Add action for low battery tip" into pi-dev am: ed7101cd2a
...
am: c051396951
2018-05-10 17:25:45 -07:00
TreeHugger Robot
64135745b9
Merge "Add help uri for smart battery page" into pi-dev
2018-05-11 00:12:31 +00:00
Fan Zhang
ecd3b2da54
Merge "Remove search option in Magnification settings" into pi-dev
...
am: f9b93310c5
2018-05-10 17:01:45 -07:00
Fan Zhang
f9b93310c5
Merge "Remove search option in Magnification settings" into pi-dev
2018-05-10 23:56:02 +00:00
Lei Yu
c6b50f1d77
Merge "Update strings in battery settings." into pi-dev am: faa5c2281e
...
am: 37a0f5cf7d
2018-05-10 16:54:00 -07:00
TreeHugger Robot
a3d991cc0c
Merge "Make it so client code does not tie tether to wifi"
2018-05-10 23:44:01 +00:00
Fan Zhang
baab651901
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
...
am: 4d6375e052
2018-05-10 16:36:58 -07:00
TreeHugger Robot
4d6375e052
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
2018-05-10 23:29:03 +00:00
TreeHugger Robot
c36030cc33
Merge "Add a new enum to support available/non-searchable settings"
2018-05-10 23:20:21 +00:00
Lei Yu
1e014ca87c
Merge "Use user doze whitelist in anomaly detection" into pi-dev am: d257c1a2d9
...
am: aeb5b38c52
2018-05-10 15:57:28 -07:00
Fan Zhang
dc00efa666
Use shorter string for MasterClear to stop truncating title
...
Change-Id: Ic1c639724c06d4671d4703b9862e77f673541f77
Fixes: 77904702
Test: visual
2018-05-10 15:19:12 -07:00
Fan Zhang
6600bbaf10
Merge "Remove search option in Magnification settings"
2018-05-10 22:14:06 +00:00
Lei Yu
c051396951
Merge "Add action for low battery tip" into pi-dev
...
am: ed7101cd2a
2018-05-10 15:07:02 -07:00
TreeHugger Robot
ed7101cd2a
Merge "Add action for low battery tip" into pi-dev
2018-05-10 21:52:43 +00:00
Lei Yu
37a0f5cf7d
Merge "Update strings in battery settings." into pi-dev
...
am: faa5c2281e
2018-05-10 14:51:03 -07:00
TreeHugger Robot
faa5c2281e
Merge "Update strings in battery settings." into pi-dev
2018-05-10 21:28:31 +00:00
Fan Zhang
8f699b270d
Add a new enum to support available/non-searchable settings
...
Bug: 72748524
Test: existing robotests
Change-Id: I46b2b4a4fa33d8a94de83829cc1eddc99e89b247
2018-05-10 13:53:59 -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
