Quang Luong
132e8286cb
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
am: 6f7a9b88ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I842c62d47fff47de41dcc40a18eca8f777ecc1db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:51:21 +00:00
Quang Luong
93ae7acbf4
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
61eb591020
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
am: 6c02827b8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I5c04d7f3c942107fb958480f67344cc9daa006ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:25:27 +00:00
Diego Vela
668aea9b55
Use androidx.window from prebuilt.
...
Use androidx.window prebuilt for consistency.
Bug: 223114509
Test: m -j
Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
2022-04-14 09:55:36 +00:00
Presubmit Automerger Backend
3632d82d97
[automerge] Unchecked battery saver switch once it's 1st launch 2p: d2ce1d9194
am: 2885a43ddd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17707388
Change-Id: Id55628cd91c2be5615d371b9279589c301223c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-13 11:55:36 +00:00
TreeHugger Robot
55aba46fe9
Merge "Unchecked battery saver switch once it's 1st launch" into tm-dev
2022-04-13 11:15:46 +00:00
Presubmit Automerger Backend
2885a43ddd
[automerge] Unchecked battery saver switch once it's 1st launch 2p: d2ce1d9194
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17707388
Bug: 227725656
Change-Id: If2036f7792f3c9358e88061d5afd4873612fd3f9
2022-04-13 09:07:40 +00:00
Wesley Wang
d2ce1d9194
Unchecked battery saver switch once it's 1st launch
...
- Add low battery warning ack check to onSwitchChanged(), reset the
switch to off once it's 1st time launch, the switch should be enable
by battery saver change event at 1st instead of enable directly, will
not check this state anymore after 1st launch
Bug: 227725656
Test: make RunSettingsRoboTests
Change-Id: I79f502f567fae5dd10166d8b24fd50d59c261001
2022-04-13 17:06:52 +08:00
Edgar Wang
e40e18c10d
Merge changes from topic "presubmit-am-020809e13415452dbdf7bee571efa369"
...
* changes:
[automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e
2p: 739a359b07
[automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e
Index the gesture options in System Navigation Settings page
2022-04-13 04:34:04 +00:00
Edgar Wang
5a539c5cb2
Merge "Index the gesture options in System Navigation Settings page" into tm-dev
2022-04-13 04:34:04 +00:00
Edgar Wang
2c52db547b
Merge changes from topic "presubmit-am-020809e13415452dbdf7bee571efa369" into tm-mainline-prod
...
* changes:
[automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e
Index the gesture options in System Navigation Settings page
2022-04-13 04:34:04 +00:00
Presubmit Automerger Backend
8eadfcd0d6
[automerge] Fix that device isn't responding for a while when resetting all settings on “Display size and text” page. 2p: 09a2a49bd3
am: 74dd53583b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845
Change-Id: I76f447e38c77aff30b587694088d053d50a524c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-13 01:25:25 +00:00
Julia Reynolds
773c7e937e
[automerge] Add missing extra when launching apps 2p: 87bb1b34c5
am: 3d8de3e21f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989
Change-Id: I305aa504ba2c4b242078341b9af15e62b8a25a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-13 00:52:16 +00:00
PETER LIANG
8bd6647885
Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev
2022-04-13 00:39:27 +00:00
Presubmit Automerger Backend
74dd53583b
[automerge] Fix that device isn't responding for a while when resetting all settings on “Display size and text” page. 2p: 09a2a49bd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845
Bug: 223747686
Bug: 220082104
Bug: 220070773
Change-Id: If66da507a1e49fa2abec0f4a36507cb73fb176b4
2022-04-13 00:38:51 +00:00
Peter_Liang
09a2a49bd3
Fix that device isn't responding for a while when resetting all settings on “Display size and text” page.
...
Goal:
Probably has the race condition issue between "Bold text" and the other features including "Display Size", “Font Size” if they would be enabled at the same time, so our workaround is that the “Bold text” would be reset first and then do the remaining to avoid flickering problem.
Bug: 223747686
Bug: 220082104
Bug: 220070773
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: If1425fe2579bec8dded69680ac73fbfb03c37321
2022-04-13 00:38:44 +00:00
TreeHugger Robot
6a489ca8b7
Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5ba3
am: 54f6f65f13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927
Change-Id: I221b376e3d1f844aa970b84936570d6bfd5c70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-13 00:36:36 +00:00
TreeHugger Robot
14a3861f0b
Merge "Add missing extra when launching apps" into tm-dev
2022-04-12 23:27:14 +00:00
Julia Reynolds
3d8de3e21f
[automerge] Add missing extra when launching apps 2p: 87bb1b34c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989
Change-Id: Ib37af2c92b1da8de0ce14f643db2e4ad1775408b
2022-04-12 20:21:07 +00:00
Julia Reynolds
87bb1b34c5
Add missing extra when launching apps
...
As promised in the api docs
Test: AbstractZenModeAutomaticRulePreferenceControllerTest, view
schedule DND page
Fixes: 221423986
Change-Id: I7ddc1b112950da225afa2ba13ebf5df481922177
2022-04-12 16:20:01 -04:00
TreeHugger Robot
7a4f6a5ba3
Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev
2022-04-12 17:24:05 +00:00
Edgar Wang
8b2165a414
[automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e
2p: 739a359b07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395
Change-Id: I84b8d5cd0c913106597377a2392489469f8f6c13
2022-04-11 13:29:21 +00:00
Edgar Wang
739a359b07
[automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395
Change-Id: I0d3b1e9416e0928cae610f1b36825b6f325f6b73
2022-04-11 13:29:12 +00:00
Edgar Wang
257ebe4a5e
Index the gesture options in System Navigation Settings page
...
Fixes: 167536360
Test: manual verify & robotest
Change-Id: Ie1a24a7206153dc1405f8a28369a6bade11ddd39
2022-04-11 21:05:37 +08:00
TreeHugger Robot
ecde21063a
Merge changes from topic "presubmit-am-c49a96c26d054adbb0d2e7c248dd53a1" into tm-mainline-prod am: 67b061ae0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131
Change-Id: I36d4b7699e8610f0f8f0073c6f504251a9d98387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-09 09:21:44 +00:00
TreeHugger Robot
3ed73b7b2d
Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev
2022-04-09 08:59:05 +00:00
TreeHugger Robot
67b061ae0b
Merge changes from topic "presubmit-am-c49a96c26d054adbb0d2e7c248dd53a1" into tm-mainline-prod
...
* changes:
[automerge] Fix unexpected Wi-Fi hotspot shutdown 2p: 6c42636cb8
Fix unexpected Wi-Fi hotspot shutdown
2022-04-09 08:59:04 +00:00
Mill Chen
a9c43b938d
Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79
am: 0a4bbff802
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074
Change-Id: If75ec07f5896033bef78bb2bb3acff5a01e49498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 06:27:36 +00:00
Mill Chen
34eecaad79
Merge "Add cache mechanism for secondary users in Storage" into tm-dev
2022-04-08 05:48:45 +00:00
Weng Su
a0e05a271d
[automerge] Fix unexpected Wi-Fi hotspot shutdown 2p: 6c42636cb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131
Bug: 227719584
Change-Id: Icc8a154a06170a321c848578797c6a8c823cc845
2022-04-07 21:37:05 +00:00
Weng Su
6c42636cb8
Fix unexpected Wi-Fi hotspot shutdown
...
- Filter out unnecessary onSwitchChanged callbacks when the switch is
disabled, which should not be triggered by user input.
- Refine the state handling function to avoid unnecessary
onSwitchChanged callback.
- Refine the error handling of isHotspotPasswordValid function.
Bug: 227719584
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest
Change-Id: If62aaadc8ddb214769b1367d7801b6125bb5377c
2022-04-08 05:35:14 +08:00
Chaohui Wang
0bee8b57c4
Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
am: 1aebd5fb02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525
Change-Id: Ia850d51dec2cc813a65928ef12c6edcccfbe245b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:11:25 +00:00
Chaohui Wang
1aebd5fb02
Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525
Change-Id: I9a02fa61cf65039e905b98a25e5510ae2e7c262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 17:54:53 +00:00
Peiyong Lin
7ef70db34d
Merge "Remove GameSettings and ExtraAppInfo." into tm-dev
2022-04-07 17:48:18 +00:00
Peiyong Lin
a4f590f1f1
Merge changes from topic "remove_game_dashboard"
...
* changes:
[automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
2p: f621f13d83
[automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
Remove GameSettings and ExtraAppInfo.
2022-04-07 17:48:18 +00:00
Peiyong Lin
c3ce36da27
Merge changes from topic "remove_game_dashboard" into tm-mainline-prod
...
* changes:
[automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
Remove GameSettings and ExtraAppInfo.
2022-04-07 17:48:18 +00:00
Chaohui Wang
f2178a48ee
Merge "Clean up unused Sliceable.copy()" into tm-dev
2022-04-07 17:31:08 +00:00
Presubmit Automerger Backend
b2b0822ee9
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
2p: e1705a25b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094
Bug: 203168097
Change-Id: I6be138b4f338e0e3a8c255e4a3d2d02bfb23253b
2022-04-07 04:08:28 +00:00
Weng Su
22c8bf81e1
Restrict Wi-Fi toggle in Internet Settings
...
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.
- Show restriction message in Wi-Fi toggle summary.
- See the result screenshot in b/203168097#comment24
Bug: 203168097
Test: manual test
atest -c WifiSwitchPreferenceControllerTest
Change-Id: I3cfe2f4f0e855dde91a82babe3a03005c3985d59
2022-04-07 12:06:13 +08:00
TreeHugger Robot
d23aa91e8b
Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev
2022-04-06 15:00:11 +00:00
Yi Jiang
4652097173
[automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2
2p: e6f28fbd49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008
Bug: 227292811
Change-Id: I47f32600feffd755dccad876f2cf5bb7b68c8c6d
2022-04-06 06:49:40 +00:00
Yi Jiang
e6f28fbd49
[automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008
Bug: 227292811
Change-Id: Ibab34cc241b50c473e6951d46f6be1697bfadb03
2022-04-06 06:49:32 +00:00
Yi Jiang
284cb1c2b2
Fixes 'learn more' link in ScreenTimeoutSettings
...
Bug: 227292811
Test: make RunSettingsRoboTests
Change-Id: I0e5678e6760ebd590dfd526f362207776ece3a70
2022-04-06 06:49:19 +00:00
Kedar Chitnis
1149c12949
Merge "Guest mode UX flow updates to user settings"
2022-04-06 04:18:05 +00:00
TreeHugger Robot
4eedbed2f4
Merge "Added test for FP Enroll vibration" into tm-d1-dev am: f733c0d7c9
am: b9128f28f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17606348
Change-Id: I127f181f8d00443fac9efa49446eb28f13954df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 01:51:53 +00:00
TreeHugger Robot
f733c0d7c9
Merge "Added test for FP Enroll vibration" into tm-d1-dev
2022-04-06 01:04:47 +00:00
Joshua McCloskey
2a05de0df1
Added test for FP Enroll vibration
...
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 222593183
Change-Id: I18ba2471c506c9a34151dc34c5f5f423db478c06
2022-04-05 23:28:14 +00:00
Peiyong Lin
c858e7e18e
[automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
2p: f621f13d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733
Change-Id: I26779ff68346f089155d4d0f15e2afd5b351a234
2022-04-05 21:52:06 +00:00
Peiyong Lin
e14c23fcf9
Remove GameSettings and ExtraAppInfo.
...
Bug: b/224595815
Test: manual
Change-Id: Ifc9a9e8c0b4b2170144639abb2f81f8916d5f164
2022-04-05 21:45:05 +00:00
Chaohui Wang
63ddb79c0d
Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d
am: 9734698f71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483
Change-Id: I45fa8dca8c1f449741876191f62727de3040925b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 08:51:10 +00:00