Suprabh Shukla
d47817ffcb
Merge "Unrestricting app when put on power whitelist" into pi-dev
...
am: e70e27ccea
2018-05-11 16:22:15 -07:00
Lei Yu
b8cfe7fff0
Merge "Add help uri for restricted apps page" into pi-dev
...
am: f4c8a4cdf5
2018-05-11 16:20:23 -07:00
TreeHugger Robot
e70e27ccea
Merge "Unrestricting app when put on power whitelist" into pi-dev
2018-05-11 23:06:49 +00:00
Lei Yu
f4c8a4cdf5
Merge "Add help uri for restricted apps page" into pi-dev
2018-05-11 23:05:41 +00:00
Fan Zhang
326ff3dbe1
Add help uri for restricted apps page
...
Bug: 77299457
Test: Build
Change-Id: I46c208f9805f47a4f42e44338ea5dce0451dd671
2018-05-11 14:56:49 -07:00
Beverly Tai
e493237128
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
...
am: 49499bcb06
2018-05-11 14:10:11 -07:00
Suprabh Shukla
0f447022cf
Unrestricting app when put on power whitelist
...
Power whitelisting and background restrictions are opposing rules, so to
keep apps out of confusing states, unrestricting an app whenever it is
put on the power whitelist.
Test: atest RunSettingsRoboTests:HighPowerDetailTest
Bug: 77924141
Change-Id: I4952ac6c893bc7e98aa1b6ad3a86906fc299dea5
2018-05-11 14:00:28 -07:00
Beverly Tai
49499bcb06
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
2018-05-11 20:59:49 +00:00
Beverly
d4e7eedfc9
DO NOT MERGE Add DND Settings suggestion
...
Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-11 20:59:38 +00:00
Doris Ling
374d15333f
Merge "Rename settings category." into pi-dev
...
am: a44d07c10d
2018-05-11 13:56:47 -07:00
TreeHugger Robot
a44d07c10d
Merge "Rename settings category." into pi-dev
2018-05-11 20:49:35 +00:00
Ryan Lin
71b333f162
Merge "Add call volume in sound settings" into pi-dev
...
am: b46389a588
2018-05-11 13:36:20 -07:00
Ryan Lin
325b292eb6
Merge "Implement getProfileId() method in the subclass" into pi-dev
...
am: 0a87e54edb
2018-05-11 13:22:07 -07:00
Ryan Lin
5d7faa9696
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev
...
am: dee5035764
2018-05-11 13:21:29 -07:00
Ryan Lin
b46389a588
Merge "Add call volume in sound settings" into pi-dev
2018-05-11 20:13:16 +00:00
Ryan Lin
0a87e54edb
Merge "Implement getProfileId() method in the subclass" into pi-dev
2018-05-11 19:53:19 +00:00
Ryan Lin
dee5035764
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev
2018-05-11 19:53:19 +00:00
Lei Yu
8abf13ecc2
Merge "Remove the padding for VideoPreference" into pi-dev
...
am: d7ebfe3475
2018-05-11 11:57:05 -07:00
Fan Zhang
75cbd6d88d
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
...
am: fe522dc2db
2018-05-11 11:38:31 -07:00
TreeHugger Robot
d7ebfe3475
Merge "Remove the padding for VideoPreference" into pi-dev
2018-05-11 18:13:48 +00:00
Fan Zhang
fe522dc2db
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
2018-05-11 18:02:22 +00:00
Todd Kennedy
45d58cab2c
Merge "OMS: rebase settings when overlays update" into pi-dev
...
am: 203b7b1792
2018-05-11 11:00:07 -07:00
Doris Ling
b715d6b675
Rename settings category.
...
- from night light to night display.
Change-Id: I2d6c8d931793439dc3b028b4b7a46c21444e10a0
Fixes: 79530682
Test: make RunSettingsRoboTests
2018-05-11 10:59:58 -07:00
Todd Kennedy
203b7b1792
Merge "OMS: rebase settings when overlays update" into pi-dev
2018-05-11 17:44:53 +00: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
ryanywlin
ef301823d3
Implement getProfileId() method in the subclass
...
Add getProfileId() method in LocalBluetoothProfile interface,
implement this method in subclass.
Bug: 76447449
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsProfilesControllerTest -j28
Change-Id: I8082716b7cdaf7394ee2f8a4b636058716af7bb1
2018-05-11 20:25:13 +08:00
ryanywlin
156fd91fbd
Add call volume in sound settings
...
* Add call volume slider
* move "Take call" controller from "Ring volume" to "Call volume"
Bug: 77254162
Test: make -j50 RunSettingsRoboTests
Change-Id: I3443021c1557f42293e9b7772fe9072e5a966cf8
2018-05-11 17:56:16 +08: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
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
ryanywlin
5365eaa6db
Use another callback to notify the updater that UI should be updated
...
Replace onConnectionStateChanged callback
with onProfileConnectionStateChanged. While
updater is notified, isFilterMatched(cachedDevice)
will decide whether to add/remove from UI based
on audio profiles and audio mode.
Bug: 76447449
Test: make RunSettingsRoboTests -j28
Change-Id: Icfba1ce2297e4638679158f9f99bae276940d885
2018-05-11 05:44:43 +00: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
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
timhypeng
6f70289b25
Update string from "Add device" to "Pair new device" in Setting > Connected devices
...
* Replace string ID from "connected_device_add_device_title" to "bluetooth_pairing_pref_title" in Connected devices
* Reuse ID and change string "Add device" back
* BACKUP_MESSAGE_ID=7803521577708810621
Bug: 79298885
Test: make -j50 RunSettingsRoboTests
Change-Id: I29f72002c0ece4981d5a523c8649a78acb80730d
2018-05-11 10:01:36 +08: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
Lei Yu
c1ec772399
Remove the padding for VideoPreference
...
In old days, VideoPreference has special padding in landscape and no
padding in protrait. This CL removes the padding dimen entirely.
Change-Id: Ic0ecd27cf7e200bd8fda58a37643482f146793a8
Fixes: 79543761
Test: Screenshot
2018-05-10 17:51:52 -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
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
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
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
