Suprabh Shukla
a8eb28f219
Merge "Unrestricting app when put on power whitelist" into pi-dev am: e70e27ccea
...
am: d47817ffcb
2018-05-11 17:00:22 -07:00
Lei Yu
a01cefad2e
Merge "Add help uri for restricted apps page" into pi-dev am: f4c8a4cdf5
...
am: b8cfe7fff0
2018-05-11 16:44:09 -07:00
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
Beverly Tai
451eeaa08a
[automerger skipped] Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev am: 49499bcb06
...
am: e493237128
2018-05-11 16:16:10 -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
Doris Ling
079738a26a
Merge "Rename settings category." into pi-dev am: a44d07c10d
...
am: 374d15333f
2018-05-11 16:01:38 -07:00
Ryan Lin
18aa25ea47
Merge "Add call volume in sound settings" into pi-dev am: b46389a588
...
am: 71b333f162
2018-05-11 15:44:53 -07:00
Ryan Lin
440e08faf5
Merge "Implement getProfileId() method in the subclass" into pi-dev am: 0a87e54edb
...
am: 325b292eb6
2018-05-11 15:25:02 -07:00
Ryan Lin
b5f9ba4e9b
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev am: dee5035764
...
am: 5d7faa9696
2018-05-11 15:24:30 -07:00
TreeHugger Robot
4ef5b7c738
Merge "Update screen title for lock screen preferences."
2018-05-11 22:05:32 +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
TreeHugger Robot
38be78fbea
Merge "Make pref unsearchable for more availibility status."
2018-05-11 21:53:18 +00: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
Fan Zhang
ea04e32eed
Update screen title for lock screen preferences.
...
Bug: 71892510
Test: visual
Change-Id: I4abe0c2370f10bb68e668c07a033852601b4c2ab
2018-05-11 13:45:02 -07:00
Ryan Lin
71b333f162
Merge "Add call volume in sound settings" into pi-dev
...
am: b46389a588
2018-05-11 13:36:20 -07:00
TreeHugger Robot
d43283b53a
Merge changes Ic9d1b08c,Id6db9ce2,I7b980218
...
* changes:
Add zen starred contacts preference
Clear deprecated effects when saving zen policy
DND settings redesign
2018-05-11 20:33:10 +00: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
938176292f
Merge "Remove the padding for VideoPreference" into pi-dev am: d7ebfe3475
...
am: 8abf13ecc2
2018-05-11 12:34:22 -07:00
Fan Zhang
c71d4fc405
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: fe522dc2db
...
am: 75cbd6d88d
2018-05-11 12:03:38 -07:00
TreeHugger Robot
1f0ff7214c
Merge "Make local variables final where possible in CredentialStorage"
2018-05-11 19:03:21 +00:00
Lei Yu
8abf13ecc2
Merge "Remove the padding for VideoPreference" into pi-dev
...
am: d7ebfe3475
2018-05-11 11:57:05 -07:00
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
Fan Zhang
80376a5b46
Make pref unsearchable for more availibility status.
...
Bug: 72748524
Test: robotest
Change-Id: I12b13ac3503f851857787df98a2d2f599c71b9b7
2018-05-11 11:45:02 -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
Irina Dumitrescu
ea8406f75d
Make local variables final where possible in CredentialStorage
...
This speeds up the run-time of credential settings.
Test: this is tested at compile time.
Change-Id: I77d577cace07826596eb40223a36a8d327b3d72b
2018-05-11 19:08:01 +01: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
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
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
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
