Matthew Fritze
111fc0344b
Merge "Fix DND crash from SpringboardActivity" into pi-dev am: 3f790b76b0
...
am: 7fcbaf4ac9
2018-05-29 12:52:43 -07:00
Matthew Fritze
7fcbaf4ac9
Merge "Fix DND crash from SpringboardActivity" into pi-dev
...
am: 3f790b76b0
2018-05-29 12:05:33 -07:00
TreeHugger Robot
3f790b76b0
Merge "Fix DND crash from SpringboardActivity" into pi-dev
2018-05-29 18:47:23 +00:00
TreeHugger Robot
cb4faa37e9
Merge "Modified the ManageDomainUrls"
2018-05-29 17:34:41 +00:00
hjchangliao
51ea41a541
Update Android Beam screen layout
...
Use preference footer layout to replace
the old layout android_beam.
Change-Id: I878333ecc001631020706cb02edde48496859dcb
Fixes: 80085332
Test: Manual test
2018-05-28 11:27:26 +08:00
Michael Wright
1c7ae169ac
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev am: 8c60fc69b7
...
am: 23460d03bc
2018-05-25 19:17:33 -07:00
Michael Wright
23460d03bc
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
...
am: 8c60fc69b7
2018-05-25 19:12:31 -07:00
TreeHugger Robot
8c60fc69b7
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
2018-05-26 02:03:09 +00:00
Alexey Kuzmin
d335f6124e
Merge "Add vibration preview" into pi-dev am: 1ec06d4623
...
am: 6a090b46cf
2018-05-25 18:09:19 -07:00
Alexey Kuzmin
6a090b46cf
Merge "Add vibration preview" into pi-dev
...
am: 1ec06d4623
2018-05-25 18:04:18 -07:00
TreeHugger Robot
1ec06d4623
Merge "Add vibration preview" into pi-dev
2018-05-26 00:58:16 +00:00
Michael Wright
304f44b94a
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev am: 76e0cb6678
...
am: 5c2736823e
2018-05-25 17:33:37 -07:00
Michael Wright
5c2736823e
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
...
am: 76e0cb6678
2018-05-25 17:28:35 -07:00
TreeHugger Robot
76e0cb6678
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
2018-05-26 00:20:44 +00:00
stanley.tf_wang
828409a79d
Modified the ManageDomainUrls
...
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
atest UniquePreferenceTest
atest SettingsGatewayTest
Change-Id: Ib5b1281be6cb3cab8528d10b6d6ff3146f33b8df
2018-05-25 16:16:21 -07:00
Michael Wright
c93dfd8f48
Add michaelwr to OWNERS for haptics settings in accessibility
...
Bug: 80243632
Test: N/A
Change-Id: Id315d626af527946230affc292ed9b329efe8b5b
2018-05-25 23:38:59 +01:00
Michael Wright
3dbaac6e71
Hide haptic intensity settings for devices without enough dynamic range.
...
Despite our hope, devices prior to P18 just don't have the dynamic range
to give three distinct vibration intensity settings. Given this, only
show an on / off toggle for devices by default unless they explicitly
opt-in to multiple intensity levels.
Test: m -j RunSettingsRoboTests
Bug: 80243632
Change-Id: I14ece855cf20f9fa44b0648d28f89c0053be5c5f
2018-05-25 22:57:03 +01:00
TreeHugger Robot
834305e258
Merge "Remove OverlayManagerWrapper class out from Settings"
2018-05-25 21:08:13 +00:00
Matthew Fritze
a559103b1b
Fix DND crash from SpringboardActivity
...
Special case Uris need to explicitly add their intents.
This unfortunately duplicates a list of special-cased Slices,
but I have attached a bug with a plan to address this duplicity in Q.
Change-Id: I346915c32543713d33716422018d7c950cce323d
Fixes: 80065409
Test: atest SliceDeepLinkSpringBoardTest
2018-05-25 13:35:23 -07:00
Ching-Sung Li
feae5d79cf
Remove OverlayManagerWrapper class out from Settings
...
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.
Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I0bddf50d8ea7721fe258a9a9b51f8c56dd5afcce
2018-05-25 12:59:18 -07:00
Fan Zhang
5c688f3eae
Merge "2nd attempt to fix Slice strict mode." into pi-dev
...
am: 7d214f99ee
2018-05-25 12:49:29 -07:00
TreeHugger Robot
7d214f99ee
Merge "2nd attempt to fix Slice strict mode." into pi-dev
2018-05-25 19:44:32 +00:00
TreeHugger Robot
9534fbdf1b
Merge "2nd attempt to fix Slice strict mode."
2018-05-25 18:41:28 +00:00
Fan Zhang
934de22622
2nd attempt to fix Slice strict mode.
...
1. Use real BluetoothAdapter instead of settingslib version. The
settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
in background thread. When in background, the enforcement from Slice
framework (StrictMode#ThreadPolicy) is not useful and can be safely
ignored.
Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Bug: 79985175
Test: robotests
2018-05-25 10:39:59 -07:00
Matthew Fritze
b9d07718d5
Merge "Add remaining whitelisted controllers" into pi-dev
...
am: da07a66365
2018-05-25 10:02:14 -07:00
TreeHugger Robot
da07a66365
Merge "Add remaining whitelisted controllers" into pi-dev
2018-05-25 16:53:44 +00:00
TreeHugger Robot
fdef0464e9
Merge "Add remaining whitelisted controllers"
2018-05-25 16:47:57 +00:00
Fan Zhang
2313b24215
2nd attempt to fix Slice strict mode.
...
1. Use real BluetoothAdapter instead of settingslib version. The
settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
in background thread. When in background, the enforcement from Slice
framework (StrictMode#ThreadPolicy) is not useful and can be safely
ignored.
Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Merged-In: I68523148f4c1dc88a54e207447d21ec439478cdf
Fixes: 79985175
Test: robotests
2018-05-25 16:37:56 +00:00
Fan Zhang
a8c2602987
Merge "Update storage header background to colorPrimary" into pi-dev
...
am: 5431191163
2018-05-25 08:59:26 -07:00
Fan Zhang
5431191163
Merge "Update storage header background to colorPrimary" into pi-dev
2018-05-25 15:49:59 +00:00
Matthew Fritze
bee0516dfe
Merge "Make summary text update after settings changes" into pi-dev
...
am: b915f3566b
2018-05-25 08:09:13 -07:00
TreeHugger Robot
b915f3566b
Merge "Make summary text update after settings changes" into pi-dev
2018-05-25 15:01:26 +00:00
TreeHugger Robot
038d1f9db5
Merge "Make summary text update after settings changes"
2018-05-25 14:52:59 +00:00
Jason Monk
7c3c3b1154
Merge "Follow SliceManager API changes" into pi-dev am: d68ed5c92c
...
am: 667d662d85
2018-05-24 23:51:44 -07:00
Antony Sargent
97e418f45c
Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8
...
am: 75ffd61ee3
2018-05-24 23:50:12 -07:00
Lei Yu
3a9bad927e
Merge "Update icon for battery saver conditon." into pi-dev am: 89e0287711
...
am: 4c39b05ad7
2018-05-24 23:48:36 -07:00
Petri Gynther
6a2ed0aed5
Merge "Set default value of A2DP HW offload toggle" into pi-dev am: d6acb081af
...
am: 6cc221169b
2018-05-24 23:46:01 -07:00
Jason Monk
667d662d85
Merge "Follow SliceManager API changes" into pi-dev
...
am: d68ed5c92c
2018-05-24 19:04:31 -07:00
Jason Monk
d68ed5c92c
Merge "Follow SliceManager API changes" into pi-dev
2018-05-25 01:21:35 +00:00
Chihhang Chuang
6c1c1a6a50
Merge "Refactor nfc preference controller" into pi-dev
...
am: 2357c1cd84
2018-05-24 16:35:26 -07:00
Antony Sargent
75ffd61ee3
Merge "Update sound settings icons" into pi-dev
...
am: 2e0709b3b8
2018-05-24 16:31:15 -07:00
TreeHugger Robot
8653748a18
Merge "Fix a NPE when highlighting fingerprint row."
2018-05-24 21:44:50 +00:00
Lei Yu
4c39b05ad7
Merge "Update icon for battery saver conditon." into pi-dev
...
am: 89e0287711
2018-05-24 13:56:57 -07:00
Lucas Dupin
c7a226c27a
Merge "Setting to change sysui theme" into pi-dev
...
am: 7179206395
2018-05-24 13:39:19 -07:00
Matthew Fritze
a2ea991101
Make summary text update after settings changes
...
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.
Change-Id: I4d04642bc80b97c5191bf0e1e7a5e15a2c58d6c9
Merged-In: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
Fixes: 79779837
Test: robotest
2018-05-24 20:10:24 +00:00
Matthew Fritze
06600041bc
Make summary text update after settings changes
...
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.
Bug: 79779837
Test: robotest
Change-Id: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
2018-05-24 13:08:23 -07:00
Fan Zhang
e2f520bcaf
Update storage header background to colorPrimary
...
Change-Id: I07f78cc6452846829b92d25fe9c41c6efe40a459
Merged-In: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
Fixes: 79773433
Test: visual
2018-05-24 17:50:33 +00:00
TreeHugger Robot
2357c1cd84
Merge "Refactor nfc preference controller" into pi-dev
2018-05-24 17:45:19 +00:00
Matthew Fritze
61227fb093
Add remaining whitelisted controllers
...
Because I missed them in the long whitelist the first time...
Change-Id: I9fbd7b33e06b3f2f6e5e5778f78abfdb1a52006a
Merged-In: I01c8c80fe306667c1d3ac007b16fad546c5a5f40
Fixes: 79779103
Test: robotests
2018-05-24 17:29:03 +00:00
Matthew Fritze
0cb62643d6
Add remaining whitelisted controllers
...
Because I missed them in the long whitelist the first time...
Bug: 79779103
Test: robotests
Change-Id: I01c8c80fe306667c1d3ac007b16fad546c5a5f40
2018-05-24 10:27:29 -07:00
