OSDN Git Service
TreeHugger Robot [Tue, 15 May 2018 17:04:10 +0000 (17:04 +0000)]
Merge "Add and update string" into pi-dev
Jeff Gaston [Tue, 15 May 2018 16:37:55 +0000 (16:37 +0000)]
Merge "Update for support library prebuilt drop" into pi-dev
Jeff Gaston [Tue, 8 May 2018 18:41:39 +0000 (14:41 -0400)]
Update for support library prebuilt drop
Bug:
79267345
Test: m -j checkbuild
Change-Id: I086a2253a1c94af6f7c4dca04d2644a4f9e54ef5
TreeHugger Robot [Tue, 15 May 2018 13:45:32 +0000 (13:45 +0000)]
Merge "Remove old meta data declarations in manifest" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 13:18:42 +0000 (13:18 +0000)]
Merge "Delay index job a little bit" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 13:16:22 +0000 (13:16 +0000)]
Merge "Gets rid of dividers in sound settings" into pi-dev
hughchen [Tue, 15 May 2018 06:15:30 +0000 (14:15 +0800)]
Add and update string
* Change the string from "cast" to "driving mode"
* Add string "Bluetooth, NFC" and "Bluetooth"
Bug:
79299421
Test: build pass
Change-Id: I6da7e54545f209110fca8e7a107f3b20066c7623
timhypeng [Tue, 24 Apr 2018 13:45:23 +0000 (21:45 +0800)]
Click left side of list in "previously connected devices" should connect to the device
* In "previously connected devices", to connect device
* In "Available media devices", to activate device
Bug:
77607104
Test: make -j50 RunSettingsRoboTests
Change-Id: If5005031bd3f5dc4950abf2c77575785cd6f67b1
Merged-In: If5005031bd3f5dc4950abf2c77575785cd6f67b1
TreeHugger Robot [Tue, 15 May 2018 03:09:19 +0000 (03:09 +0000)]
Merge "Add string for disabled FAS toggle." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 01:15:18 +0000 (01:15 +0000)]
Merge "Remove the dynamic summary for bt preference." into pi-dev
Lei Yu [Tue, 15 May 2018 00:55:21 +0000 (17:55 -0700)]
Add string for disabled FAS toggle.
If FAS toggle is disabled because app is in doze whitelist(not optimized), show
a dialog that has this string.
Bug:
77924141
Test: Manual
Change-Id: I30518cd887125bff00b7c567e26204d5b1814858
Naina Nalluri [Mon, 14 May 2018 22:59:11 +0000 (22:59 +0000)]
Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
TreeHugger Robot [Mon, 14 May 2018 21:29:09 +0000 (21:29 +0000)]
Merge "Add cancel button for private dns dialog" into pi-dev
Beverly [Mon, 14 May 2018 21:13:43 +0000 (17:13 -0400)]
Gets rid of dividers in sound settings
Change-Id: I71a5e37a48cb6366a161ccc6cf456960f1491eec
Fixes:
79480349
Test: visual inspection (Settings > Sound)
Matthew Fritze [Mon, 14 May 2018 21:11:18 +0000 (14:11 -0700)]
Remove old meta data declarations in manifest
Change-Id: Ic27b950cc5e640f823074b974f9d29078973fad7
Fixes:
79151692
Test: builds
Lei Yu [Mon, 14 May 2018 20:42:12 +0000 (13:42 -0700)]
Remove the dynamic summary for bt preference.
Starting from b/
62069132, we should use static summary for it.
Change-Id: I8ba5a9d6e8b5bcbcd9f4369cdf44004d557257a3
Fixes:
79666649
Test: Manual
Lei Yu [Mon, 14 May 2018 20:45:57 +0000 (20:45 +0000)]
Merge "Update the battery broadcast receiver." into pi-dev
Naina Nalluri [Wed, 2 May 2018 21:30:11 +0000 (14:30 -0700)]
DO NOT MERGE Add Slices for WifiCalling
Add Slices for WifiCalling
WifiCalling Slice Provider:
1. If there is no activation needed or if the Wifi calling
is currently turned on - provide the slice to toggle the
value
2. Else display appropriate message with further instructions
WifiCalling Slice Broadcast Receiver:
1. If the action is turning off wifi or if there is no
activation needed. Change the setting with ImsManager.
2. And Ask to requery the slice in one second to display
updated settings if 1 is valid or display appropriate message
Bug:
63731862
Bug:
78192106
Test: Use support-slices-demos-debug.apk to test on device
Test: Robotests
Change-Id: I29e1822fd24ebcff575fa48ad93f84ed91bf4d87
Lei Yu [Mon, 14 May 2018 20:08:58 +0000 (13:08 -0700)]
Add cancel button for private dns dialog
Also update the onclick method.
Change-Id: I69e92584e056a4d0a686153315b8df002d91e204
Fixes:
79479021
Test: RunSettingsRoboTests
Lei Yu [Thu, 10 May 2018 00:27:17 +0000 (17:27 -0700)]
Update the battery broadcast receiver.
Add a type for battery receiver, then in callback client know for
which reason it been invoked:
1. battery level change
2. battery saver state change
3. battery plug state change
So in this CL, we won't update battery tip for battery level change,
then battery tip won't be dismissed by itself.
Also note in onResume() we will manually update battery tip. So if
user stay in battery settings page and close the screen, once he opens
it we will still force update everything.
Fixes:
79171742
Test: RunSettingsRoboTests
Change-Id: I997844216fd8267e545d74e0d434de9e338f76a1
Merged-In: I997844216fd8267e545d74e0d434de9e338f76a1
Jason Monk [Mon, 14 May 2018 18:40:01 +0000 (14:40 -0400)]
Delay index job a little bit
Make sure it doesn't cause jank while launching settings.
Test: existing
Change-Id: I410315469319b2156495f2d8b296fc164c475cb9
Fixes:
78787416
TreeHugger Robot [Mon, 14 May 2018 18:31:42 +0000 (18:31 +0000)]
Merge "Protect against multiple starts of device index job" into pi-dev
TreeHugger Robot [Mon, 14 May 2018 18:20:29 +0000 (18:20 +0000)]
Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev
TreeHugger Robot [Mon, 14 May 2018 15:29:12 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev
Jason Monk [Mon, 14 May 2018 15:14:19 +0000 (11:14 -0400)]
Protect against multiple starts of device index job
Its rare, but can happen.
Test: existing tests pass
Change-Id: Ie7aaa47902741d5f7fdd954f35e8f13e9466e07c
Fixes:
78898947
Beverly [Fri, 11 May 2018 18:03:25 +0000 (14:03 -0400)]
DO NOT MERGE Always show custom zen vis eff option
+ dnd string edits
Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Bug:
79538038
Bug:
78447976
Test: ZenModeViseffectsCustomPreferenceControllerTest
TreeHugger Robot [Sun, 13 May 2018 05:08:26 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 12 May 2018 19:16:11 +0000 (12:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ide496214e78fbc4bdbd606ecff720a8cf988daa5
TreeHugger Robot [Sat, 12 May 2018 04:37:27 +0000 (04:37 +0000)]
Merge "Make it so client code does not tie tether to wifi" into pi-dev
Hansong Zhang [Fri, 11 May 2018 23:23:55 +0000 (23:23 +0000)]
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
Doris Ling [Fri, 11 May 2018 23:33:36 +0000 (23:33 +0000)]
Merge "Update the initial expanded count for apps and notifications." into pi-dev
TreeHugger Robot [Fri, 11 May 2018 23:06:49 +0000 (23:06 +0000)]
Merge "Unrestricting app when put on power whitelist" into pi-dev
Lei Yu [Fri, 11 May 2018 23:05:41 +0000 (23:05 +0000)]
Merge "Add help uri for restricted apps page" into pi-dev
Fan Zhang [Thu, 10 May 2018 18:07:27 +0000 (18:07 +0000)]
Add help uri for restricted apps page
Bug:
77299457
Test: Build
Change-Id: I46c208f9805f47a4f42e44338ea5dce0451dd671
Doris Ling [Fri, 11 May 2018 20:00:23 +0000 (13:00 -0700)]
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
Suprabh Shukla [Fri, 11 May 2018 03:11:26 +0000 (20:11 -0700)]
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
Beverly Tai [Fri, 11 May 2018 20:59:49 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
Beverly [Wed, 9 May 2018 19:27:45 +0000 (15:27 -0400)]
DO NOT MERGE Add DND Settings suggestion
Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug:
78445134
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: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
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
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
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: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
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: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 [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 [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 [Thu, 10 May 2018 23:56:02 +0000 (23:56 +0000)]
Merge "Remove search option in Magnification settings" into pi-dev
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
TreeHugger Robot [Thu, 10 May 2018 21:52:43 +0000 (21:52 +0000)]
Merge "Add action for low battery tip" into pi-dev
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
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
Merged-In: I699dfe2d7646f248a54faa5a8429176697614cdf
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: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
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: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: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
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: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
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
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
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: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: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
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