Fan Zhang
74ba1a51d7
Skip device index job if caller is not Settings app.
...
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Test: robotests
2018-05-30 10:38:58 -07:00
TreeHugger Robot
fcac34d723
Merge "Give PBAP permission only after user confirms" into pi-dev
2018-05-30 17:35:57 +00:00
Fan Zhang
09df7d7071
[automerger skipped] Merge "Plumb context object to PowerWhitelistBackend." into pi-dev am: cf2e1fd593
...
am: 4a337db847
-s ours
Change-Id: Ie0b54bf4af9e77cd811f2979e97af9a973a828ae
2018-05-29 20:45:22 -07:00
Fan Zhang
4a337db847
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
...
am: cf2e1fd593
Change-Id: I7d3b2321d9cc3c44dea3738596104df2e43cb1f3
2018-05-29 20:20:55 -07:00
TreeHugger Robot
cf2e1fd593
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
2018-05-30 03:08:20 +00:00
Ivan Chiang
c6d7191cb9
Fix gray out previously connected device preference issue
...
Count the dock devices in previously connected device controller.
Change-Id: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
Fix: 80227045
Test: m -j SettingsRoboTests RunSettingsRoboTests
2018-05-30 02:45:47 +00:00
Fan Zhang
70af6d884c
[automerger skipped] Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev am: ce7d1ab3bb
...
am: 85d843f72d
-s ours
Change-Id: Ieb58d9b8ef64af319e433e36a2d9a20acab002fa
2018-05-29 19:07:20 -07:00
TreeHugger Robot
6e06da361a
Merge "Plumb context object to PowerWhitelistBackend."
2018-05-30 01:50:40 +00:00
Fan Zhang
85d843f72d
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
...
am: ce7d1ab3bb
Change-Id: I57a3b66ba8b4c84b7407ada5e1d754b49d85e61a
2018-05-29 18:01:02 -07:00
TreeHugger Robot
3a05544d34
Merge "Misc fixes for Settings"
2018-05-30 00:26:48 +00:00
TreeHugger Robot
ce7d1ab3bb
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
2018-05-30 00:18:45 +00:00
Fan Zhang
3489f65024
Plumb context object to PowerWhitelistBackend.
...
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:33:01 +00:00
Fan Zhang
7e395e1a00
Plumb context object to PowerWhitelistBackend.
...
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:32:22 +00:00
Fan Zhang
9ab2f37226
Prevent disabling default phone/sms apps in battery setting
...
- In handleDisableable(), call getKeepEnabledPackages() in the same way
as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
app packages.
Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:25:56 +00:00
Fan Zhang
b70b11e02b
Prevent disabling default phone/sms apps in battery setting
...
- In handleDisableable(), call getKeepEnabledPackages() in the same way
as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
app packages.
Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Bug: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:21:24 +00:00
Hansong Zhang
500c83c1bc
Give PBAP permission only after user confirms
...
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
2018-05-29 22:15:51 +00:00
Fan Zhang
8379a09554
Misc fixes for Settings
...
- Add some precautious logging in RoundedHomepageIcon in case b/79841665
comes back.
- Hide memory setting from app info page.
Change-Id: I37d090504ab25854e1278aa3a6d3e85781f394b1
Fixes: 79841665
Fixes: 80140797
Test: visual
2018-05-29 13:56:43 -07:00
Matthew Fritze
58019a84ed
Merge "Fix bluetooth search result no-op" into pi-dev am: f14bfcbfa6
...
am: 9cb3dd123d
Change-Id: Ib35794ec9c9e71c53145f418629287fd72d9adc6
2018-05-29 12:56:44 -07:00
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
Antony Sargent
1ee0e670b0
Merge "Another refresh of swipe up gesture video" into pi-dev am: d87ce094cd
...
am: 8155cbc0d2
Change-Id: I3021834d6e527150d1c1db95f968da6c12aba7e7
2018-05-29 12:50:32 -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
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
TreeHugger Robot
cb4faa37e9
Merge "Modified the ManageDomainUrls"
2018-05-29 17:34:41 +00:00
TreeHugger Robot
5ec9fd922d
Merge "Update Android Beam screen layout"
2018-05-29 16:45:09 +00:00
TreeHugger Robot
b621fb6b97
Merge "Add vibration preview"
2018-05-29 11:45:23 +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
Antony Sargent
e07b961cee
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev am: e4999751ab
...
am: 5d5eb8bdaa
Change-Id: I9ab28e88f627abca0ca00901bdfa0b5a0afbfa4f
2018-05-25 14:54:24 -07: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