Commit Graph

46029 Commits

Author SHA1 Message Date
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
Antony Sargent
8155cbc0d2 Merge "Another refresh of swipe up gesture video" into pi-dev
am: d87ce094cd

Change-Id: Icd8df823edcd90220f8173013e019642ac5df554
2018-05-29 12:04:21 -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
d87ce094cd Merge "Another refresh of swipe up gesture video" into pi-dev 2018-05-29 18:34:23 +00:00
android-build-team Robot
6e0d8e3b86 Snap for 4807121 from 8c60fc69b7 to pi-release
Change-Id: Ic7648d7b9e99e2adc9b0b33e5013e1504f590928
2018-05-27 07:23:47 +00: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
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
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
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
Antony Sargent
5d5eb8bdaa Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
am: e4999751ab

Change-Id: I812a58e2a0fead5b9a1eec9e9cf1b2383de1321d
2018-05-25 14:42:14 -07:00
TreeHugger Robot
e4999751ab Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev 2018-05-25 21:35:23 +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
Antony Sargent
24283d3076 Remove Advanced dropdown from "About phone" screen
All the items will appear in the list instead of hiding some under an Advanced
dropdown.

Bug: 80302533
Test: manual (Settings->System->About phone)

Change-Id: I82857ec8e027b00762c1191d9450d30dfe47016f
2018-05-25 13:05:27 -07:00
Antony Sargent
9ba04de58a Another refresh of swipe up gesture video
Bug: 77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I62c46ef38cf67b4bf200ad2420138fe6677d6999
2018-05-25 13:02:26 -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
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
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
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
667d662d85 Merge "Follow SliceManager API changes" into pi-dev
am: d68ed5c92c

Change-Id: Ice176c79605250c263a21cbc624b438902dfaedc
2018-05-24 19:04:31 -07:00
android-build-team Robot
fb5eba622d Merge cherrypicks of [4189833, 4186953, 4190512, 4190513] into pi-release
Change-Id: Ibf22ddc21efdfafd5256fb8c70d228e8a822724f
2018-05-25 01:34:38 +00:00
Jason Monk
b83242c635 Follow SliceManager API changes
Test: make
Bug: 78898947
Change-Id: I5a46ccafe36ad2e0fdac745606d9907f07a86d0c
(cherry picked from commit 20495a8c36)
2018-05-25 01:34:25 +00: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
Antony Sargent
ef75735861 Merge "Refresh several icons" into pi-dev
am: 642e63c2e0

Change-Id: I2487a06fb681680209dd5b37b7b6f376bb2d6640
2018-05-24 16:18:05 -07:00
Antony Sargent
30c39c273c Merge "Refresh system update icon" into pi-dev
am: efc2cb0492

Change-Id: Ie611915fc682d75201655c4308c3e7ba71953910
2018-05-24 16:06:22 -07:00
Lei Yu
4c39b05ad7 Merge "Update icon for battery saver conditon." into pi-dev
am: 89e0287711

Change-Id: If5b81203ee4cbf691b236f79f71213f8252ac873
2018-05-24 13:56:57 -07:00
Lucas Dupin
c7a226c27a Merge "Setting to change sysui theme" into pi-dev
am: 7179206395

Change-Id: I34f0fa82b9b9ebb9d6ba7707363a5b948c9f0421
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
Android Build Merger (Role)
1871d3d3a7 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9
Change-Id: Ib0b9bdb830263bbfb7c81033b388cd9e07e591ef
2018-05-24 18:22:37 +00:00
Android Build Merger (Role)
b9aa0fbfe9 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead
Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b
2018-05-24 18:22:35 +00:00
Android Build Merger (Role)
30d0145ead [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
2018-05-24 18:22:34 +00:00
Android Build Merger (Role)
93ee1bd17e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
2018-05-24 18:22:32 +00:00
Android Build Merger (Role)
874c51780f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
2018-05-24 18:22:30 +00:00