Commit Graph

45588 Commits

Author SHA1 Message Date
ryanywlin
f95ed0925b Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am: 7e31e22f57
am: 82db752ef0

Change-Id: I7e9a40b08afebedb7b44a6345cda8b2564db315d
2018-05-09 20:46:27 -07:00
ryanywlin
82db752ef0 Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev
am: 7e31e22f57

Change-Id: I118c59326c4403f350201b55b4711cc7bd92243d
2018-05-09 20:41:55 -07:00
TreeHugger Robot
7e31e22f57 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.
2018-05-10 03:31:33 +00:00
Mehdi Alizadeh
c1884b7c70 [automerger skipped] Merge changes from topic "swipe-up-gesture-overlay" into pi-dev am: 3167f72961
am: 85833473e1  -s ours

Change-Id: Iee0dd7da6b06856f2ed73fb0ed1efb10d127acc1
2018-05-09 20:13:40 -07:00
Mehdi Alizadeh
85833473e1 Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
am: 3167f72961

Change-Id: Iac284f04b0ba862064ea5d2822819eaf31dcb4c0
2018-05-09 20:09:15 -07:00
Mehdi Alizadeh
3167f72961 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
2018-05-10 03:01:05 +00:00
ryanywlin
8276d966e9 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
2018-05-10 10:28:20 +08:00
Lei Yu
bfedf3d506 Merge changes Ifa91ad93,I14f9696a into pi-dev am: d067cbcfc9
am: 9e639df738

Change-Id: Ic156328bb3249d9c82cc4ea38dc17bc39ddf0d27
2018-05-09 19:25:25 -07:00
ryanywlin
9f407aba36 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
2018-05-10 10:20:30 +08:00
Lei Yu
9e639df738 Merge changes Ifa91ad93,I14f9696a into pi-dev
am: d067cbcfc9

Change-Id: Idddf18d56322a274145be20a0c6858fcd6cd78e0
2018-05-09 19:16:16 -07:00
ryanywlin
eb5019d05a 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
2018-05-10 10:08:14 +08:00
Lei Yu
d067cbcfc9 Merge changes Ifa91ad93,I14f9696a into pi-dev
* changes:
  Update the BatteryTipPolicy
  Update and expose the low battery tip.
2018-05-10 02:06:19 +00:00
Mehdi Alizadeh
6df79d3d17 Imports com.android.settings.R to fix build breakage
Bug: 78908915
Bug: 78641268
Test: None

Change-Id: Ic98e58188bba211ab9e16b8915012f6ac49280ea
Merged-In: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
2018-05-09 18:54:55 -07:00
Mehdi Alizadeh
c93a97d9d5 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
2018-05-09 18:44:42 -07:00
Salvador Martinez
7e4f8a28eb Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
am: f94119e739

Change-Id: If887d0c414649489d483bf523316d1f960798000
2018-05-09 16:56:30 -07:00
Fan Zhang
33b585a831 Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am: 350c5b3c40
am: b8b9e69a94

Change-Id: I7827b526be72fb2678d7bb662e6c13f722a8aaa9
2018-05-09 16:53:43 -07:00
Salvador Martinez
f94119e739 Merge "Hide hidden network spinner for non-hidden networks" into pi-dev
am: cda8a44cee

Change-Id: If55a1837c0a9e9156f11be933ac7676edcbd6af9
2018-05-09 16:47:06 -07:00
Fan Zhang
b8b9e69a94 Merge "Fix a concurrent modification exception in Slice provider." into pi-dev
am: 350c5b3c40

Change-Id: I09d3d0148b58f954cb584b5c5c63059396af8fb1
2018-05-09 16:42:36 -07:00
TreeHugger Robot
cda8a44cee Merge "Hide hidden network spinner for non-hidden networks" into pi-dev 2018-05-09 23:41:23 +00:00
TreeHugger Robot
350c5b3c40 Merge "Fix a concurrent modification exception in Slice provider." into pi-dev 2018-05-09 23:28:45 +00:00
TreeHugger Robot
54bf10b49d Merge "Imports com.android.settings.R to fix build breakage in master" 2018-05-09 22:59:39 +00:00
Lei Yu
fdf09b4d5a Merge "Use WRAP_CONTENT for battery saver button" into pi-dev am: 1dbe185db2
am: 1f429286d2

Change-Id: Ia95728a05d7473c6898046141818700c8d52a97e
2018-05-09 15:28:38 -07:00
Lei Yu
1f429286d2 Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
am: 1dbe185db2

Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2
2018-05-09 15:08:09 -07:00
Mehdi Alizadeh
d5f74a21c9 Imports com.android.settings.R to fix build breakage in master
This change should resolve the build failure for ag/4013709 in master.

Bug: 78908915
Bug: 78641268
Test: None
Change-Id: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
2018-05-09 14:56:39 -07:00
TreeHugger Robot
1dbe185db2 Merge "Use WRAP_CONTENT for battery saver button" into pi-dev 2018-05-09 21:54:26 +00:00
Andreas Terzis
72e5c02bf1 Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev am: b5de55fbfc
am: aee672badc

Change-Id: Idaa745faed1e8a9aaaac10ecb255374caa624f65
2018-05-09 14:37:35 -07:00
Matthew Fritze
5e14f5afc9 [automerger skipped] Merge "Establish permanently unavailable settings" into pi-dev am: ab68a8107c
am: 57c000113f  -s ours

Change-Id: I2f4b619271e987fc42991458b677307303e414f7
2018-05-09 14:35:52 -07:00
Andreas Terzis
aee672badc Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
am: b5de55fbfc

Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf
2018-05-09 14:31:06 -07:00
Matthew Fritze
57c000113f Merge "Establish permanently unavailable settings" into pi-dev
am: ab68a8107c

Change-Id: I492624cf4d1fcfba85c0dc6f9042f456ce882ed5
2018-05-09 14:21:22 -07:00
Andreas Terzis
b5de55fbfc Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev 2018-05-09 21:15:43 +00:00
TreeHugger Robot
ab68a8107c Merge "Establish permanently unavailable settings" into pi-dev 2018-05-09 21:13:44 +00:00
Salvador Martinez
bfcedc54b0 Merge "Remove the Settings search keywords from Slices" into pi-dev am: 26453818b9
am: 7e34ffdb6a

Change-Id: Ib4abbf9c4b4db45ab99846b7377ecaea4c0e9745
2018-05-09 13:45:05 -07:00
Salvador Martinez
7e34ffdb6a Merge "Remove the Settings search keywords from Slices" into pi-dev
am: 26453818b9

Change-Id: I9dbc077c72a0ca4b29364f7eea39d3e4f82f1fdb
2018-05-09 13:41:03 -07:00
Salvador Martinez
26453818b9 Merge "Remove the Settings search keywords from Slices" into pi-dev 2018-05-09 20:30:02 +00:00
android-build-team Robot
6a66bae12b [automerger skipped] Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev am: 9110d29f13
am: 8d504b4d98  -s ours

Change-Id: I265784b7b4e0236f73db72a7984ddb4116d4de57
2018-05-09 13:25:37 -07:00
android-build-team Robot
8d504b4d98 Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
am: 9110d29f13

Change-Id: Ib6ff8cf2cfde3ee12bdb757b4a691b90ba02c398
2018-05-09 13:03:38 -07:00
Fan Zhang
a55993c12c Fix a concurrent modification exception in Slice provider.
Change-Id: I87449dda9a56b5e8932dc4c6bec462195cb89348
Fixes: 79372493
Test: monkey
2018-05-09 12:51:20 -07:00
android-build-team Robot
9110d29f13 Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev 2018-05-09 19:47:02 +00:00
android-build-team Robot
a75d1e41ce Merge "Don't check battery usage in excessive bg anomaly" into pi-dev am: 27f1e8e1e9
am: 5dc5fbc0d5

Change-Id: Idabb5bcca09b7617334133615e92bfce59281c18
2018-05-09 12:41:47 -07:00
Lei Yu
df83cf3c29 Update the BatteryTipPolicy
1. Add "testLowBatteryTip"
2. Update default value for low battery threshold

Change-Id: Ifa91ad93f484dc806dfc176ad5ffd912824f5063
Bug: 76113067
Test: RunSettingsRoboTests
2018-05-09 12:31:54 -07:00
Lei Yu
b2f089c468 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
2018-05-09 12:31:41 -07:00
Andreas Terzis
3fed7fb0e2 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
2018-05-09 12:12:01 -07:00
android-build-team Robot
579300b00c Merge "Show Option of "Screen lock options" on SUW pattern screen page" 2018-05-09 19:09:08 +00:00
Beverly
17c6de8e68 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
2018-05-09 18:50:48 +00:00
android-build-team Robot
5dc5fbc0d5 Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
am: 27f1e8e1e9

Change-Id: I2457fb1ae8cf8c63d71429c873d6f2b4ef52860f
2018-05-09 11:19:36 -07:00
android-build-team Robot
02ec86a17b Merge "Establish permanently unavailable settings" 2018-05-09 18:14:32 +00:00
android-build-team Robot
c0e0262f9c Merge "Rename SubSettingLauncher.setTitle, add java doc" 2018-05-09 18:01:10 +00:00
android-build-team Robot
27f1e8e1e9 Merge "Don't check battery usage in excessive bg anomaly" into pi-dev 2018-05-09 17:54:30 +00:00
Lei Yu
d0ca222d9a Use WRAP_CONTENT for battery saver button
Change-Id: Id1d417021eff56c3733f6711f121085ad67ae3da
Fixes: 79256447
Test: Screenshot
2018-05-09 10:44:23 -07:00
Matthew Fritze
bd376296cd 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
2018-05-09 10:03:40 -07:00