Meng Wang
3a4e213037
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev am: 6fcafbe5bf
...
am: ed6037dffa
2018-05-10 12:10:09 -07:00
Meng Wang
ed6037dffa
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
...
am: 6fcafbe5bf
2018-05-10 12:07:38 -07:00
TreeHugger Robot
6fcafbe5bf
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
2018-05-10 18:57:39 +00:00
Fan Zhang
4979f434fc
Merge "Fix a typo in AndroidManifest.xml" into pi-dev am: 3a9fbac582
...
am: e50f5effa0
2018-05-10 11:32:23 -07:00
Fan Zhang
e50f5effa0
Merge "Fix a typo in AndroidManifest.xml" into pi-dev
...
am: 3a9fbac582
2018-05-10 11:20:24 -07:00
Fan Zhang
3a9fbac582
Merge "Fix a typo in AndroidManifest.xml" into pi-dev
2018-05-10 18:07:27 +00:00
TreeHugger Robot
88c10e9169
Merge "Add shorter string for Previously connected device"
2018-05-10 17:02:15 +00:00
Beverly Tai
127777b6e7
[automerger skipped] Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev am: 60a9ed8627
...
am: c93a0dc2fb
2018-05-10 06:41:00 -07:00
Beverly Tai
c93a0dc2fb
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
...
am: 60a9ed8627
2018-05-10 06:35:13 -07:00
Beverly Tai
60a9ed8627
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
2018-05-10 13:28:47 +00:00
hjchangliao
0d1f1d3cd7
Add shorter string for Previously connected device
...
Original string is too long to show in title bar,
Add a shorter string to avoid clipped.
Change-Id: Ib8b14100f71cb65862036235f290f9f548949b79
Fixes: 78127123
Test: Manual test
2018-05-10 16:18:33 +08:00
Meng Wang
6de3389b92
Revert "Remove provisioning dialog from wifi-tethering"
...
This reverts commit 81ca3dd4c0
2018-05-10 05:15:43 +00:00
ryanywlin
f95ed0925b
Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am: 7e31e22f57
...
am: 82db752ef0
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
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
2018-05-09 20:13:40 -07:00
Mehdi Alizadeh
85833473e1
Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
...
am: 3167f72961
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
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
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
Fan Zhang
66156d68e7
Fix a typo in AndroidManifest.xml
...
And some drive-by clean up.
Change-Id: Ic036f8f5bec8064a5d55e0e032ce45e483323b14
Fixes: 78889604
Test: atest
2018-05-09 18:06:27 -07:00
Salvador Martinez
7e4f8a28eb
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
...
am: f94119e739
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
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
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
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
2018-05-09 15:28:38 -07:00
Lei Yu
1f429286d2
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
...
am: 1dbe185db2
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
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
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
2018-05-09 14:31:06 -07:00
Matthew Fritze
57c000113f
Merge "Establish permanently unavailable settings" into pi-dev
...
am: ab68a8107c
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
2018-05-09 13:45:05 -07:00
Salvador Martinez
7e34ffdb6a
Merge "Remove the Settings search keywords from Slices" into pi-dev
...
am: 26453818b9
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
2018-05-09 13:25:37 -07:00
Beverly
a4d5980869
DO NOT MERGE Add zen starred contacts preference
...
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-09 16:12:10 -04:00
android-build-team Robot
8d504b4d98
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
...
am: 9110d29f13
2018-05-09 13:03:38 -07:00
