Commit Graph

45750 Commits

Author SHA1 Message Date
Todd Kennedy
94fecb94e9 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
2018-05-10 11:02:42 -07:00
Beverly
3403c3729e 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-10 13:37:37 -04:00
Julia Reynolds
200da8978f DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976
2018-05-10 13:25:35 -04: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  -s ours

Change-Id: If63814774deff6cc157115ddb18bd1eea48432d5
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

Change-Id: I9a16629067a76f2113c6ed312796aa47dda7f649
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.

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
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

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
Lei Yu
d71e8d8c87 Use user doze whitelist in anomaly detection
Bug: 77924141
Test: RunSettingsRoboTests
Change-Id: Id9503c9468292f128b76ea872d6603c49965d919
2018-05-09 19:22:57 -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
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

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
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

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