OSDN Git Service
Ryan Lin [Fri, 11 May 2018 22:44:53 +0000 (15:44 -0700)]
Merge "Add call volume in sound settings" into pi-dev am:
b46389a588
am:
71b333f162
Change-Id: If69203fa5c4158f609484e6c3bbc0ca5bd6e0f58
Ryan Lin [Fri, 11 May 2018 22:25:02 +0000 (15:25 -0700)]
Merge "Implement getProfileId() method in the subclass" into pi-dev am:
0a87e54edb
am:
325b292eb6
Change-Id: Ia68e70ba6ebffa2df20c9b0b909abfaf9d7250e2
Ryan Lin [Fri, 11 May 2018 22:24:30 +0000 (15:24 -0700)]
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev am:
dee5035764
am:
5d7faa9696
Change-Id: I7db97d62afbdb6deacc9f0b34393697acd44b0f2
TreeHugger Robot [Fri, 11 May 2018 22:05:32 +0000 (22:05 +0000)]
Merge "Update screen title for lock screen preferences."
TreeHugger Robot [Fri, 11 May 2018 21:53:18 +0000 (21:53 +0000)]
Merge "Make pref unsearchable for more availibility status."
Fan Zhang [Fri, 11 May 2018 20:32:32 +0000 (13:32 -0700)]
Update screen title for lock screen preferences.
Bug:
71892510
Test: visual
Change-Id: I4abe0c2370f10bb68e668c07a033852601b4c2ab
Ryan Lin [Fri, 11 May 2018 20:36:20 +0000 (13:36 -0700)]
Merge "Add call volume in sound settings" into pi-dev
am:
b46389a588
Change-Id: I38c7fbede3a758440c9d4ce0a7aa0b3999719cec
TreeHugger Robot [Fri, 11 May 2018 20:33:10 +0000 (20:33 +0000)]
Merge changes Ic9d1b08c,Id6db9ce2,I7b980218
* changes:
Add zen starred contacts preference
Clear deprecated effects when saving zen policy
DND settings redesign
Ryan Lin [Fri, 11 May 2018 20:22:07 +0000 (13:22 -0700)]
Merge "Implement getProfileId() method in the subclass" into pi-dev
am:
0a87e54edb
Change-Id: Ic24dfd0db114826e5ad7a01579210cfd2fbdca48
Ryan Lin [Fri, 11 May 2018 20:21:29 +0000 (13:21 -0700)]
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev
am:
dee5035764
Change-Id: I68661899ec3f8fe0ea7d4419c630786bba923ea6
Ryan Lin [Fri, 11 May 2018 20:13:16 +0000 (20:13 +0000)]
Merge "Add call volume in sound settings" into pi-dev
Ryan Lin [Fri, 11 May 2018 19:53:19 +0000 (19:53 +0000)]
Merge "Implement getProfileId() method in the subclass" into pi-dev
Ryan Lin [Fri, 11 May 2018 19:53:19 +0000 (19:53 +0000)]
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev
Lei Yu [Fri, 11 May 2018 19:34:22 +0000 (12:34 -0700)]
Merge "Remove the padding for VideoPreference" into pi-dev am:
d7ebfe3475
am:
8abf13ecc2
Change-Id: I2055a85a26d0f14a862f7993cd77f8fedd2b68be
Fan Zhang [Fri, 11 May 2018 19:03:38 +0000 (12:03 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am:
fe522dc2db
am:
75cbd6d88d
Change-Id: Id5e20cb105f5a3c11648f226f7b46317052353ce
TreeHugger Robot [Fri, 11 May 2018 19:03:21 +0000 (19:03 +0000)]
Merge "Make local variables final where possible in CredentialStorage"
Lei Yu [Fri, 11 May 2018 18:57:05 +0000 (11:57 -0700)]
Merge "Remove the padding for VideoPreference" into pi-dev
am:
d7ebfe3475
Change-Id: Ia6bde79679965769516f40134b5dd58fac645ca6
Todd Kennedy [Fri, 11 May 2018 18:53:09 +0000 (11:53 -0700)]
Merge "OMS: rebase settings when overlays update" into pi-dev am:
203b7b1792
am:
45d58cab2c
Change-Id: Iab503a1196a7412d101e4c5c7831785bf5fd18bb
Fan Zhang [Thu, 10 May 2018 21:11:49 +0000 (14:11 -0700)]
Make pref unsearchable for more availibility status.
Bug:
72748524
Test: robotest
Change-Id: I12b13ac3503f851857787df98a2d2f599c71b9b7
Fan Zhang [Fri, 11 May 2018 18:38:31 +0000 (11:38 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am:
fe522dc2db
Change-Id: I380123375af5eed570915472d4ae34402d6af006
TreeHugger Robot [Fri, 11 May 2018 18:13:48 +0000 (18:13 +0000)]
Merge "Remove the padding for VideoPreference" into pi-dev
Irina Dumitrescu [Fri, 11 May 2018 18:03:42 +0000 (19:03 +0100)]
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
Fan Zhang [Fri, 11 May 2018 18:02:22 +0000 (18:02 +0000)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
Todd Kennedy [Fri, 11 May 2018 18:00:07 +0000 (11:00 -0700)]
Merge "OMS: rebase settings when overlays update" into pi-dev
am:
203b7b1792
Change-Id: Icc4933994802079f96bc2b170d9167688b2939d9
Todd Kennedy [Fri, 11 May 2018 17:44:53 +0000 (17:44 +0000)]
Merge "OMS: rebase settings when overlays update" into pi-dev
timhypeng [Fri, 11 May 2018 17:32:40 +0000 (10:32 -0700)]
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev am:
4017944d17
am:
fe323a7359
Change-Id: I97fe217535a8d9f8da756505c7b60662202a3867
timhypeng [Fri, 11 May 2018 17:21:55 +0000 (10:21 -0700)]
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
am:
4017944d17
Change-Id: I7eefdbbc9ff9a1892b3309c4d284d2358d589b0f
TreeHugger Robot [Fri, 11 May 2018 17:02:08 +0000 (17:02 +0000)]
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
ryanywlin [Fri, 11 May 2018 12:25:13 +0000 (20:25 +0800)]
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
ryanywlin [Wed, 25 Apr 2018 02:56:36 +0000 (10:56 +0800)]
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
AL Ho [Fri, 11 May 2018 06:58:10 +0000 (14:58 +0800)]
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
AL HO [Fri, 11 May 2018 07:55:53 +0000 (00:55 -0700)]
[automerger skipped] Merge "Update Accessbility vibration settings." into pi-dev am:
204dcfdb4c
am:
d507ddd71c -s ours
Change-Id: Ia7063753b264c4baa9e3cf329a432419e8d05e76
AL HO [Fri, 11 May 2018 07:23:51 +0000 (00:23 -0700)]
Merge "Update Accessbility vibration settings." into pi-dev
am:
204dcfdb4c
Change-Id: I946902304191ca136cdb960683cdf742cb8ff9a3
AL HO [Fri, 11 May 2018 07:11:14 +0000 (07:11 +0000)]
Merge "Update Accessbility vibration settings." into pi-dev
timhypeng [Fri, 11 May 2018 06:16:35 +0000 (14:16 +0800)]
Add discoverable footer preference string when bluetooth is off
Bug:
79294219
Test: build pass
Change-Id: Iea8c75bed099466060405d81b793404619059642
Fan Zhang [Fri, 11 May 2018 06:04:02 +0000 (23:04 -0700)]
[automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev am:
9e629edb09
am:
b76c1ba682 -s ours
Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31
Fan Zhang [Fri, 11 May 2018 05:59:31 +0000 (22:59 -0700)]
Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
am:
9e629edb09
Change-Id: Ibab3710f94c418dd345b76fb4d2fd3f486b8c499
TreeHugger Robot [Fri, 11 May 2018 05:49:29 +0000 (05:49 +0000)]
Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
ryanywlin [Thu, 3 May 2018 05:40:52 +0000 (13:40 +0800)]
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
TreeHugger Robot [Fri, 11 May 2018 04:46:53 +0000 (04:46 +0000)]
Merge "Fix a strict mode violation in SystemUpdatePrefController"
hughchen [Fri, 11 May 2018 04:25:34 +0000 (21:25 -0700)]
Merge "Add Pair new device on Bluetooth screen" into pi-dev am:
b87eb6aa06
am:
c183f43dfe
Change-Id: I94d06345dc2911298b9a45634f989516a0939694
hughchen [Fri, 11 May 2018 04:20:59 +0000 (21:20 -0700)]
Merge "Add Pair new device on Bluetooth screen" into pi-dev
am:
b87eb6aa06
Change-Id: I4ca53abcb7bb28cafc8b7527c82a97f6b70545f8
TreeHugger Robot [Fri, 11 May 2018 04:12:53 +0000 (04:12 +0000)]
Merge "Add “Pair new device” on Bluetooth screen" into pi-dev
Fan Zhang [Wed, 9 May 2018 22:42:00 +0000 (15:42 -0700)]
Fix a strict mode violation in SystemUpdatePrefController
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Bug:
78626509
Test: robotests
AL Ho [Wed, 28 Mar 2018 04:06:30 +0000 (12:06 +0800)]
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
hughchen [Thu, 10 May 2018 11:28:44 +0000 (19:28 +0800)]
Add “Pair new device” on Bluetooth screen
* Add AddDevicePreferenceController in bluetooth_screen.xml
Bug:
79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I4e43e31d05c297ca206cd2b0f747bb615c3dfcd4
timhypeng [Thu, 10 May 2018 09:57:50 +0000 (17:57 +0800)]
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
Lei Yu [Fri, 11 May 2018 01:26:48 +0000 (18:26 -0700)]
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev am:
b98039e263
am:
5740dd8604
Change-Id: I0b982809ccb0419b5773fb05c9b59f402dbbcbee
Doris Ling [Fri, 11 May 2018 01:14:54 +0000 (18:14 -0700)]
Merge "Map the new category keys to the corresponding fragment." into pi-dev am:
be5fa599be
am:
b04528670b
Change-Id: I44e1cc9b2e631b19bb51079230821d5e59f496ec
Lei Yu [Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)]
Merge "Add help uri for smart battery page" into pi-dev am:
64135745b9
am:
ae09975605
Change-Id: I04595941491f6d2747cbf7c6db03afad166fb6df
Lei Yu [Fri, 11 May 2018 01:05:59 +0000 (18:05 -0700)]
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
am:
b98039e263
Change-Id: Ie12a079ea1ab083772d3b6c08d2db51157a9315b
Doris Ling [Fri, 11 May 2018 01:03:05 +0000 (18:03 -0700)]
Merge "Map the new category keys to the corresponding fragment." into pi-dev
am:
be5fa599be
Change-Id: Ie55eee4ac77b9ce9be5f9d1ff3a0bb769fb2f5b9
Fan Zhang [Fri, 11 May 2018 01:02:38 +0000 (18:02 -0700)]
[automerger skipped] Merge "Remove search option in Magnification settings" into pi-dev am:
f9b93310c5
am:
ecd3b2da54 -s ours
Change-Id: I99a647a6f5b29093ce64be9c19622a3bde10a359
Lei Yu [Thu, 10 May 2018 23:20:05 +0000 (16:20 -0700)]
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
Lei Yu [Fri, 11 May 2018 00:49:22 +0000 (00:49 +0000)]
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 00:46:42 +0000 (00:46 +0000)]
Merge "Map the new category keys to the corresponding fragment." into pi-dev
Fan Zhang [Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)]
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev am:
4d6375e052
am:
baab651901
Change-Id: I9a024644f81a62bd5cfce912e96bb37320cdab31
Lei Yu [Fri, 11 May 2018 00:34:01 +0000 (17:34 -0700)]
Merge "Add help uri for smart battery page" into pi-dev
am:
64135745b9
Change-Id: I85102ee5824c2b8e52b638cee17334fe65132c9f
Fan Zhang [Wed, 9 May 2018 22:42:00 +0000 (15:42 -0700)]
Fix a strict mode violation in SystemUpdatePrefController
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Merged-In: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Fixes:
78626509
Test: robotests
Lei Yu [Fri, 11 May 2018 00:25:45 +0000 (17:25 -0700)]
Merge "Add action for low battery tip" into pi-dev am:
ed7101cd2a
am:
c051396951
Change-Id: If2fee93c5ab5ba96fb843b11633f5704043b3067
TreeHugger Robot [Fri, 11 May 2018 00:12:31 +0000 (00:12 +0000)]
Merge "Add help uri for smart battery page" into pi-dev
Fan Zhang [Fri, 11 May 2018 00:01:45 +0000 (17:01 -0700)]
Merge "Remove search option in Magnification settings" into pi-dev
am:
f9b93310c5
Change-Id: I626e6ebf41395938abf74f004612e982a0ed8005
Fan Zhang [Thu, 10 May 2018 23:56:02 +0000 (23:56 +0000)]
Merge "Remove search option in Magnification settings" into pi-dev
Lei Yu [Thu, 10 May 2018 23:54:00 +0000 (16:54 -0700)]
Merge "Update strings in battery settings." into pi-dev am:
faa5c2281e
am:
37a0f5cf7d
Change-Id: I55da31048dd2804198272f8016e135860a5433ee
TreeHugger Robot [Thu, 10 May 2018 23:44:01 +0000 (23:44 +0000)]
Merge "Make it so client code does not tie tether to wifi"
Fan Zhang [Thu, 10 May 2018 23:36:58 +0000 (16:36 -0700)]
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
am:
4d6375e052
Change-Id: I08afa778d2a7a6af1cbcf3493077c964caa8d5c1
TreeHugger Robot [Thu, 10 May 2018 23:29:03 +0000 (23:29 +0000)]
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
TreeHugger Robot [Thu, 10 May 2018 23:20:21 +0000 (23:20 +0000)]
Merge "Add a new enum to support available/non-searchable settings"
Lei Yu [Thu, 10 May 2018 22:57:28 +0000 (15:57 -0700)]
Merge "Use user doze whitelist in anomaly detection" into pi-dev am:
d257c1a2d9
am:
aeb5b38c52
Change-Id: Id75f81f42a2de2b459e6fd0c705e916324021959
Fan Zhang [Thu, 10 May 2018 22:10:19 +0000 (15:10 -0700)]
Use shorter string for MasterClear to stop truncating title
Change-Id: Ic1c639724c06d4671d4703b9862e77f673541f77
Fixes:
77904702
Test: visual
Beverly [Wed, 9 May 2018 19:28:21 +0000 (15:28 -0400)]
Add zen starred contacts preference
Bug:
78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
Fan Zhang [Thu, 10 May 2018 22:14:06 +0000 (22:14 +0000)]
Merge "Remove search option in Magnification settings"
Lei Yu [Thu, 10 May 2018 22:07:02 +0000 (15:07 -0700)]
Merge "Add action for low battery tip" into pi-dev
am:
ed7101cd2a
Change-Id: If303953ec4493c20d531b6845a392ba58585c483
TreeHugger Robot [Thu, 10 May 2018 21:52:43 +0000 (21:52 +0000)]
Merge "Add action for low battery tip" into pi-dev
Lei Yu [Thu, 10 May 2018 21:51:03 +0000 (14:51 -0700)]
Merge "Update strings in battery settings." into pi-dev
am:
faa5c2281e
Change-Id: I0196ea02f6e3ca9ff533feae1942540daa35e0c2
TreeHugger Robot [Thu, 10 May 2018 21:28:31 +0000 (21:28 +0000)]
Merge "Update strings in battery settings." into pi-dev
Fan Zhang [Thu, 10 May 2018 20:53:59 +0000 (13:53 -0700)]
Add a new enum to support available/non-searchable settings
Bug:
72748524
Test: existing robotests
Change-Id: I46b2b4a4fa33d8a94de83829cc1eddc99e89b247
Doris Ling [Thu, 10 May 2018 20:32:24 +0000 (13:32 -0700)]
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
rafftsai [Thu, 10 May 2018 03:18:03 +0000 (11:18 +0800)]
Remove search option in Magnification settings
- AccessibilitySettingsForSetupWizardActivity add extra argument to hide
search and help menu. It applies to AccessibilitySettingsForSetupWizard.
Add extra in MagnificationPreferenceFragment when launch from SUW.
Fixes:
74195957
Test: am start -a android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW
Change-Id: I8314e3a01907e0befa63b96271bfc2b15c5a1d50
Merged-In: I8314e3a01907e0befa63b96271bfc2b15c5a1d50
rafftsai [Thu, 10 May 2018 03:18:03 +0000 (11:18 +0800)]
Remove search option in Magnification settings
- AccessibilitySettingsForSetupWizardActivity add extra argument to hide
search and help menu. It applies to AccessibilitySettingsForSetupWizard.
Add extra in MagnificationPreferenceFragment when launch from SUW.
Fixes:
74195957
Test: am start -a android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW
Change-Id: I8314e3a01907e0befa63b96271bfc2b15c5a1d50
Salvador Martinez [Mon, 7 May 2018 20:34:59 +0000 (13:34 -0700)]
Make it so client code does not tie tether to wifi
The wifi service already handles turning off tethering if
multi-interface is/isn't supported. We don't need to do tie wifi
and tethering stuff together in the UI.
Test: robotests still pass
Bug:
79213401
Change-Id: I699dfe2d7646f248a54faa5a8429176697614cdf
Lei Yu [Thu, 10 May 2018 20:22:34 +0000 (13:22 -0700)]
Add help uri for smart battery page
Bug:
77299457
Test: Build
Change-Id: I3d0ba355e0ded6f830eddd501f57af601c0b33c7
Lei Yu [Thu, 10 May 2018 20:21:47 +0000 (13:21 -0700)]
Merge "Use user doze whitelist in anomaly detection" into pi-dev
am:
d257c1a2d9
Change-Id: I0d7d66e96395197baed09e012b52be83bb2f4129
Lei Yu [Thu, 10 May 2018 20:10:42 +0000 (20:10 +0000)]
Merge "Use user doze whitelist in anomaly detection" into pi-dev
Lei Yu [Thu, 10 May 2018 18:45:31 +0000 (11:45 -0700)]
Add action for low battery tip
The action should be same as EarlyWarningTip.
1. Option to "turn on battery saver" is battery is low
2. Or show "battery saver is on" and take user to "battery saver" page.
Fixes:
76113067
Test: RunSettingsRoboTests
Change-Id: I896358305a8ae4cd97c3864bbf6e556b4d025dd7
Meng Wang [Thu, 10 May 2018 19:10:09 +0000 (12:10 -0700)]
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev am:
6fcafbe5bf
am:
ed6037dffa
Change-Id: I163fb4c27334f64362033a94ebaad55387c8da61
Meng Wang [Thu, 10 May 2018 19:07:38 +0000 (12:07 -0700)]
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
am:
6fcafbe5bf
Change-Id: Iedc26b0440817548fe6a014c5d7454d2f8d8a88b
TreeHugger Robot [Thu, 10 May 2018 18:57:39 +0000 (18:57 +0000)]
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
Fan Zhang [Thu, 10 May 2018 18:32:23 +0000 (11:32 -0700)]
Merge "Fix a typo in AndroidManifest.xml" into pi-dev am:
3a9fbac582
am:
e50f5effa0
Change-Id: I68689c03344b1987b905b32f95f91d82b5a9e129
Lei Yu [Thu, 10 May 2018 18:31:29 +0000 (11:31 -0700)]
Update strings in battery settings.
1. Message in high usage dialog
2. Title in app usage list
Change-Id: Iac610483e10e8d2a93a18ca664aec17d9561aaf8
Fixes:
78638843
Test: RunSettingsRoboTests
Fan Zhang [Thu, 10 May 2018 18:20:24 +0000 (11:20 -0700)]
Merge "Fix a typo in AndroidManifest.xml" into pi-dev
am:
3a9fbac582
Change-Id: Ifa4fef188cdcd80ff997575ed593f67c9bb7fe86
Fan Zhang [Thu, 10 May 2018 18:07:27 +0000 (18:07 +0000)]
Merge "Fix a typo in AndroidManifest.xml" into pi-dev
Lei Yu [Thu, 10 May 2018 02:12:34 +0000 (19:12 -0700)]
Fix a bug in AnomalyDetectionJobService
Even though onStopJob is called, the service may still exist, so
we need to reset the mIsJobCanceled in onStartJob
Also remove the batteryStats since we don't need it anymore.
Change-Id: I6d48efecb750ad4e464569cac426d87014a8db90
Fixes:
77968649
Test: RunSettingsRoboTests
Todd Kennedy [Thu, 10 May 2018 17:26:07 +0000 (10:26 -0700)]
OMS: rebase settings when overlays update
When an overlay package has been upgraded, OMS needs to reconcile any
previous settings about the overlay with the new state of affairs.
Sometimes it is possible to rebase the OMS settings on the new
information [e.g. the overlay has changed categories]; sometimes the OMS
settings have to be scrapped [e.g. the overlay has changed target
package]. Update OMS to do The Right Thing.
Bug:
78809704
Test: manual (adb shell stop, adb push specially prepared overlays, adb shell start, adb exec-out cmd overlay dump)
Test: ran unit tests
Test: adb install out/target/product/walleye/data/app/SettingsUnitTests/SettingsUnitTests.apk
Test: adb shell am instrument -w -e class com.android.settings.display.ThemePreferenceControllerTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: NOTE: 3 of 4 failures both pre and post change; looks like there are issue with the unit tests themselves
Change-Id: Icd1ae633dbee5b5ca957fa6b652af6209b4b1260
Beverly [Thu, 10 May 2018 17:28:00 +0000 (13:28 -0400)]
Clear deprecated effects when saving zen policy
- Deprecated effects are set in NotificationManagerService,
so unset them before setting the NotificationPolicy
- When user clicks on Custom, they are brought to the custom vis effects
page instead of resetting custom values to presets
Fixes:
79383781
Test: manual
Test: NotificationManagerServiceTest testSetNotificationPolicy_preP_setOldNewFields
Change-Id: Id6db9ce2aaeed6321389f8dbfbea65eda30c74ad
Julia Reynolds [Fri, 4 May 2018 12:54:53 +0000 (08:54 -0400)]
DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug:
78447976
TreeHugger Robot [Thu, 10 May 2018 17:02:15 +0000 (17:02 +0000)]
Merge "Add shorter string for Previously connected device"
Beverly Tai [Thu, 10 May 2018 13:41:00 +0000 (06:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev am:
60a9ed8627
am:
c93a0dc2fb -s ours
Change-Id: If63814774deff6cc157115ddb18bd1eea48432d5
Beverly Tai [Thu, 10 May 2018 13:35:13 +0000 (06:35 -0700)]
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
am:
60a9ed8627
Change-Id: I9a16629067a76f2113c6ed312796aa47dda7f649
Beverly Tai [Thu, 10 May 2018 13:28:47 +0000 (13:28 +0000)]
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev