TreeHugger Robot
15700cb779
Merge "Protect against multiple starts of device index job" into pi-dev
2018-05-14 18:31:42 +00:00
Hansong Zhang
d27f2a4d03
Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev
...
am: cc31240f28
2018-05-14 11:28:35 -07:00
TreeHugger Robot
cc31240f28
Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev
2018-05-14 18:20:29 +00:00
Beverly
65251dd8eb
Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev
...
am: 8e27fc7583
2018-05-14 08:38:10 -07:00
TreeHugger Robot
8e27fc7583
Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev
2018-05-14 15:29:12 +00:00
Jason Monk
2e76a9ba54
Protect against multiple starts of device index job
...
Its rare, but can happen.
Test: existing tests pass
Change-Id: Ie7aaa47902741d5f7fdd954f35e8f13e9466e07c
Fixes: 78898947
2018-05-14 11:14:19 -04:00
Beverly
f487cb9e0a
DO NOT MERGE Always show custom zen vis eff option
...
+ dnd string edits
Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Bug: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTest
2018-05-14 14:39:32 +00:00
Bill Yi
e616b683bc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 8a9c47e1ba
2018-05-12 22:14:43 -07:00
TreeHugger Robot
8a9c47e1ba
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-13 05:08:26 +00:00
Bill Yi
9c5d8fdc5a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ide496214e78fbc4bdbd606ecff720a8cf988daa5
2018-05-12 12:16:11 -07:00
Salvador Martinez
de5cc27f0f
Merge "Make it so client code does not tie tether to wifi" into pi-dev
...
am: f005640b9c
2018-05-11 21:42:41 -07:00
TreeHugger Robot
f005640b9c
Merge "Make it so client code does not tie tether to wifi" into pi-dev
2018-05-12 04:37:27 +00:00
Hansong Zhang
f4f68c4117
Remove developer menu: AVDTP delay reports/inband ringing
...
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.
Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
Merged-In: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:16 +00:00
Doris Ling
b422264d55
Merge "Update the initial expanded count for apps and notifications." into pi-dev
...
am: 4af11079e8
2018-05-11 16:50:15 -07:00
Doris Ling
4af11079e8
Merge "Update the initial expanded count for apps and notifications." into pi-dev
2018-05-11 23:33:36 +00: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
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
Doris Ling
362d783a17
Update the initial expanded count for apps and notifications.
...
- increase it by 1 to accomodate the injected setting.
Change-Id: I0e131c87ffbf2b296b66717b2c6f160abb3b3269
Fixes: 77823915
Test: visual
2018-05-11 14:37:55 -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
hughchen
211d49f28c
Add “Rename device” on Bluetooth screen
...
* Add BluetoothDeviceRenamePreferenceController in bluetooth_screen.xml
* Refactor BluetoothDeviceRenamePreferenceController and BluetoothDeviceNamePreferenceController.
Let these controllers can be init in xml.
Bug: 78247352
Test: make -j50 RunSettingsRoboTests
Change-Id: Iddd0cac1e973bbd82cb30fe4c18e8b359ba4ba2b
2018-05-11 16:14:43 +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
