OSDN Git Service
Doris Ling [Fri, 11 May 2018 20:56:47 +0000 (13:56 -0700)]
Merge "Rename settings category." into pi-dev
am:
a44d07c10d
Change-Id: I3d71989d34d150c6089e24527a55da35833fae6c
TreeHugger Robot [Fri, 11 May 2018 20:49:35 +0000 (20:49 +0000)]
Merge "Rename settings category." into pi-dev
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
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 18:57:05 +0000 (11:57 -0700)]
Merge "Remove the padding for VideoPreference" into pi-dev
am:
d7ebfe3475
Change-Id: Ia6bde79679965769516f40134b5dd58fac645ca6
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
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
Doris Ling [Fri, 11 May 2018 17:59:58 +0000 (10:59 -0700)]
Rename settings category.
- from night light to night display.
Change-Id: I2d6c8d931793439dc3b028b4b7a46c21444e10a0
Fixes:
79530682
Test: make RunSettingsRoboTests
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: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 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 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
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
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: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
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
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
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
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
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
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
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
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: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
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 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
Meng Wang [Thu, 10 May 2018 05:14:41 +0000 (05:14 +0000)]
Revert "Remove provisioning dialog from wifi-tethering"
This reverts commit
81ca3dd4c0bb4c7918cadbb8378f9b96acb5babb.
Reason for revert:
This breaks carrier requirement to show error dialog/roaming warning.
Will make an entitlement app change to suppress the progress dialog
so that if the entitlement check succeeds no dialog will be shown
in most cases.
Bug:
78680359
Change-Id: I98d2aa5cc676308b1e2d16bf877dc6878a7bf4cb
ryanywlin [Thu, 10 May 2018 03:41:55 +0000 (20:41 -0700)]
Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev
am:
7e31e22f57
Change-Id: I118c59326c4403f350201b55b4711cc7bd92243d
TreeHugger Robot [Thu, 10 May 2018 03:31:33 +0000 (03:31 +0000)]
Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev
* changes:
Add hearing aid device in audio switch
Find active device for add hearing aids device into audio switcher.
Three methods for adding hearing aids device into audio switcher.
Mehdi Alizadeh [Thu, 10 May 2018 03:09:15 +0000 (20:09 -0700)]
Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
am:
3167f72961
Change-Id: Iac284f04b0ba862064ea5d2822819eaf31dcb4c0
Mehdi Alizadeh [Thu, 10 May 2018 03:01:05 +0000 (03:01 +0000)]
Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
* changes:
Imports com.android.settings.R to fix build breakage
Adds two overlay settings fields for Swipe Up gesture
ryanywlin [Fri, 27 Apr 2018 23:26:46 +0000 (07:26 +0800)]
Add hearing aid device in audio switch
- Add connected hearing aid device to MediaOutputPreferenceController
and HandsFreeProfileOutputPreferenceController
- Set active device to different profile depend on HisyncId
Bug:
78142719
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: Ib8fe4f06f8564572dffdce6fcc3f29578bf91bd9
Lei Yu [Wed, 9 May 2018 01:06:53 +0000 (18:06 -0700)]
Use user doze whitelist in anomaly detection
Bug:
77924141
Test: RunSettingsRoboTests
Change-Id: Id9503c9468292f128b76ea872d6603c49965d919
ryanywlin [Fri, 27 Apr 2018 08:54:43 +0000 (16:54 +0800)]
Find active device for add hearing aids device into audio switcher.
- Find active device accroding to different stream type and
output device.
- update isStreamFromOutputDevice() to identify general case like
DEVICE_OUT_BLUETOOTH_A2DP is subset of DEVICE_OUT_ALL_A2DP.
- add test case for these methods.
Bug:
78142719
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: I381135c120dbf051679bff7626d47e41f8d589da
Lei Yu [Thu, 10 May 2018 02:16:16 +0000 (19:16 -0700)]
Merge changes Ifa91ad93,I14f9696a into pi-dev
am:
d067cbcfc9
Change-Id: Idddf18d56322a274145be20a0c6858fcd6cd78e0
ryanywlin [Fri, 27 Apr 2018 08:46:57 +0000 (16:46 +0800)]
Three methods for adding hearing aids device into audio switcher.
- Add three methods for subclass to get connected device list
denpending on different profiles.
- Test case for these methods.
Bug:
78142719
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: Ia1367a53ab6a3432878a514490722871ed878954
Lei Yu [Thu, 10 May 2018 02:06:19 +0000 (02:06 +0000)]
Merge changes Ifa91ad93,I14f9696a into pi-dev
* changes:
Update the BatteryTipPolicy
Update and expose the low battery tip.
Mehdi Alizadeh [Thu, 10 May 2018 01:47:01 +0000 (18:47 -0700)]
Imports com.android.settings.R to fix build breakage
Bug:
78908915
Bug:
78641268
Test: None
Change-Id: Ic98e58188bba211ab9e16b8915012f6ac49280ea
Merged-In: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
Mehdi Alizadeh [Fri, 4 May 2018 18:42:46 +0000 (11:42 -0700)]
Adds two overlay settings fields for Swipe Up gesture
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.
Bug:
78908915
Bug:
78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
Fan Zhang [Thu, 10 May 2018 00:33:19 +0000 (17:33 -0700)]
Fix a typo in AndroidManifest.xml
And some drive-by clean up.
Change-Id: Ic036f8f5bec8064a5d55e0e032ce45e483323b14
Fixes:
78889604
Test: atest
Salvador Martinez [Wed, 9 May 2018 23:47:06 +0000 (16:47 -0700)]
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev
am:
cda8a44cee
Change-Id: If55a1837c0a9e9156f11be933ac7676edcbd6af9
Fan Zhang [Wed, 9 May 2018 23:42:36 +0000 (16:42 -0700)]
Merge "Fix a concurrent modification exception in Slice provider." into pi-dev
am:
350c5b3c40
Change-Id: I09d3d0148b58f954cb584b5c5c63059396af8fb1
TreeHugger Robot [Wed, 9 May 2018 23:41:23 +0000 (23:41 +0000)]
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev
TreeHugger Robot [Wed, 9 May 2018 23:28:45 +0000 (23:28 +0000)]
Merge "Fix a concurrent modification exception in Slice provider." into pi-dev
Lei Yu [Wed, 9 May 2018 22:08:09 +0000 (15:08 -0700)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
am:
1dbe185db2
Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2
TreeHugger Robot [Wed, 9 May 2018 21:54:26 +0000 (21:54 +0000)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
Andreas Terzis [Wed, 9 May 2018 21:31:06 +0000 (14:31 -0700)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
am:
b5de55fbfc
Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf
Matthew Fritze [Wed, 9 May 2018 21:21:22 +0000 (14:21 -0700)]
Merge "Establish permanently unavailable settings" into pi-dev
am:
ab68a8107c
Change-Id: I492624cf4d1fcfba85c0dc6f9042f456ce882ed5
Andreas Terzis [Wed, 9 May 2018 21:15:43 +0000 (21:15 +0000)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
TreeHugger Robot [Wed, 9 May 2018 21:13:44 +0000 (21:13 +0000)]
Merge "Establish permanently unavailable settings" into pi-dev
Salvador Martinez [Wed, 9 May 2018 20:41:03 +0000 (13:41 -0700)]
Merge "Remove the Settings search keywords from Slices" into pi-dev
am:
26453818b9
Change-Id: I9dbc077c72a0ca4b29364f7eea39d3e4f82f1fdb
Salvador Martinez [Wed, 9 May 2018 20:30:02 +0000 (20:30 +0000)]
Merge "Remove the Settings search keywords from Slices" into pi-dev
Beverly [Wed, 9 May 2018 19:28:21 +0000 (15:28 -0400)]
DO NOT MERGE Add zen starred contacts preference
Bug:
78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
android-build-team Robot [Wed, 9 May 2018 20:03:38 +0000 (13:03 -0700)]
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
am:
9110d29f13
Change-Id: Ib6ff8cf2cfde3ee12bdb757b4a691b90ba02c398
Fan Zhang [Wed, 9 May 2018 19:51:20 +0000 (12:51 -0700)]
Fix a concurrent modification exception in Slice provider.
Change-Id: I87449dda9a56b5e8932dc4c6bec462195cb89348
Fixes:
79372493
Test: monkey
android-build-team Robot [Wed, 9 May 2018 19:47:02 +0000 (19:47 +0000)]
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
Lei Yu [Fri, 20 Apr 2018 22:43:45 +0000 (15:43 -0700)]
Update the BatteryTipPolicy
1. Add "testLowBatteryTip"
2. Update default value for low battery threshold
Change-Id: Ifa91ad93f484dc806dfc176ad5ffd912824f5063
Bug:
76113067
Test: RunSettingsRoboTests
Lei Yu [Fri, 20 Apr 2018 21:58:05 +0000 (14:58 -0700)]
Update and expose the low battery tip.
This tip was punted however we need to bring it back to P. It happens
when battery level is low or remaining time is less than 3 hour. The
suggestion is to turn on battery saver.
1. Extend tip from EarlyWarningTip since it has most common logic
2. Update the detector to align it to battery saver notifcation in
systemui.
3. Update tip order to surface low battery tip.
Follow CL will:
1. Hook up the low battery threshold to server side
2. Add test stub for this tip, so we could trigger it by adb.
Change-Id: I14f9696a549393bf980e31838fb86afd5d9efbc7
Bug:
76113067
Test: RunSettingsRoboTests
Andreas Terzis [Wed, 9 May 2018 05:46:03 +0000 (22:46 -0700)]
Increase the char limit of carrier_and_update_text to 32.
The translation of the carrier_and_update_text field
in some European languages requires 32 characters. To
accomodate these requirements increase the character
limit from 30 to 32.
Also, set the field to wrap since the name of the
carrier can be long.
Bug:
76443795
Test: manual
Change-Id: Ic4c3ed0736af0535734590340e9631108707da73
Beverly [Tue, 8 May 2018 14:41:25 +0000 (10:41 -0400)]
DO NOT MERGE 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
android-build-team Robot [Wed, 9 May 2018 18:19:36 +0000 (11:19 -0700)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
am:
27f1e8e1e9
Change-Id: I2457fb1ae8cf8c63d71429c873d6f2b4ef52860f
android-build-team Robot [Wed, 9 May 2018 17:54:30 +0000 (17:54 +0000)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
Lei Yu [Tue, 8 May 2018 22:30:17 +0000 (15:30 -0700)]
Use WRAP_CONTENT for battery saver button
Change-Id: Id1d417021eff56c3733f6711f121085ad67ae3da
Fixes:
79256447
Test: Screenshot
Matthew Fritze [Thu, 3 May 2018 23:46:51 +0000 (16:46 -0700)]
Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.
The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.
Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.
Bug:
78910582
Fixes:
79245656
Test: robotests
Change-Id: I42c2cedab66be2d76999795f46470a079cc1ec71
Merged-In: I58821a6cfd6134b3b351657b6edf5f74ead00643