Commit Graph

23299 Commits

Author SHA1 Message Date
Fan Zhang
0b5f345e87 Merge "Fix a bug where device index is not skipped correct." into pi-dev am: 75b3e6f302
am: 9bc1f54268

Change-Id: Id2979eaf1f08bd2c67bd6bba31a62eb5d0acf8e2
2018-05-29 12:53:47 -07:00
Matthew Fritze
111fc0344b Merge "Fix DND crash from SpringboardActivity" into pi-dev am: 3f790b76b0
am: 7fcbaf4ac9

Change-Id: I999288a61ebc780986ed108cd0b255db6ee4d791
2018-05-29 12:52:43 -07:00
Matthew Fritze
9cb3dd123d Merge "Fix bluetooth search result no-op" into pi-dev
am: f14bfcbfa6

Change-Id: Ie4340134a533c9dcd3293e5fc4f7d5d14fb5a3bb
2018-05-29 12:51:39 -07:00
TreeHugger Robot
f14bfcbfa6 Merge "Fix bluetooth search result no-op" into pi-dev 2018-05-29 19:40:14 +00:00
Fan Zhang
9bc1f54268 Merge "Fix a bug where device index is not skipped correct." into pi-dev
am: 75b3e6f302

Change-Id: Ifba1a52d5f9a3d3ca69a13ef769d22f0bf1402f9
2018-05-29 12:06:31 -07:00
Matthew Fritze
7fcbaf4ac9 Merge "Fix DND crash from SpringboardActivity" into pi-dev
am: 3f790b76b0

Change-Id: I310c86c8ca308e7e71d22441774bf8ce036b4ddb
2018-05-29 12:05:33 -07:00
TreeHugger Robot
75b3e6f302 Merge "Fix a bug where device index is not skipped correct." into pi-dev 2018-05-29 18:48:24 +00:00
TreeHugger Robot
3f790b76b0 Merge "Fix DND crash from SpringboardActivity" into pi-dev 2018-05-29 18:47:23 +00:00
Matthew Fritze
d5fc3a95c6 Fix bluetooth search result no-op
Bluetooth fragment was manually setting intent information,
which meant that the result didn't fire an intent properly.

This type of regression or mistake will be caught in the fix for
b/77921040.

Change-Id: I49f87f40acbfc3f74ea2e97835f2644d443169e2
Fixes: 80317645
Test: robotests
2018-05-29 11:38:52 -07: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

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

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

Change-Id: Ia326faa0639ae6357df23d70f570eb7f3cd0d9e6
2018-05-25 18:09:19 -07:00
Alexey Kuzmin
6a090b46cf Merge "Add vibration preview" into pi-dev
am: 1ec06d4623

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

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

Change-Id: I02c1b2451ad75b9a10b2e7bd83089cfd1a5c9c94
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
Fan Zhang
548485336f Fix a bug where device index is not skipped correct.
When checking language/build fingerprint to skip reindex, language check
was comparing Locale object and String object, so they would never be
equal, so we accidentally reindex every time.

- Switched Objects.equal to TextUtils.equal, this catches the error at
compiler level.

Bug: 80065409
Test: compile/robotest
Change-Id: I2b3c68bb1c2fd876338f42321605567d7e64d64b
2018-05-25 16:25:14 -07: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

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

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

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

Change-Id: I17d63173b63f39acf6bada648a15dc86b1000ce2
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
Ivan Chiang
95abf59af4 Fix gray out previously connected device preference issue
Count the dock devices in previously connected device controller.

Fix: 80227045
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
Merged-In: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
2018-05-25 08:51:30 +00:00
Jason Monk
7c3c3b1154 Merge "Follow SliceManager API changes" into pi-dev am: d68ed5c92c
am: 667d662d85

Change-Id: I42f6774aed0638e9c6574c0f5332c3c235ac07f2
2018-05-24 23:51:44 -07:00
Antony Sargent
97e418f45c Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8
am: 75ffd61ee3

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

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

Change-Id: Ia6097eeec41c0d19b06ce01db136e208a4cb6ebb
2018-05-24 23:46:01 -07:00
Jason Monk
667d662d85 Merge "Follow SliceManager API changes" into pi-dev
am: d68ed5c92c

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

Change-Id: I82c793a393ec8bd92f409743173ec79a8ba0387b
2018-05-24 16:35:26 -07:00
Antony Sargent
75ffd61ee3 Merge "Update sound settings icons" into pi-dev
am: 2e0709b3b8

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