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
Lucas Silva
1333451d6d
Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 am: 336f4991af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536
Change-Id: I8c5725d8fe6dad32fdeb3fd79658d366fe11bd32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 19:37:48 +00:00
Lucas Silva
94716a5d58
Always set the customize button in dream settings to not selected.
...
This will prevent screen readers from saying the button is selected when
the outer container is selected.
Bug: 227717835
Test: locally on device
Change-Id: Ic7b4a36eb3b79ff847909ab6fcbd984eaf93d618
2022-04-08 15:34:06 +00:00
Josh Hou
ffa73fceeb
Merge changes from topic "screen_title" into tm-mainline-prod am: 2808fd6a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064
Change-Id: Ia79431bb96fa13709352d6a0e13386a9ccf76d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 12:22:43 +00:00
Josh Hou
fc0033fa2e
Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev
2022-04-08 11:32:21 +00:00
Josh Hou
2808fd6a7e
Merge changes from topic "screen_title" into tm-mainline-prod
...
* changes:
[automerge] [Panlingual] Screen title is displayed incorrectly 2p: 98490cc740
[Panlingual] Screen title is displayed incorrectly
2022-04-08 11:32:21 +00:00
Treehugger Robot
d436150433
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 am: b185066a24
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: I155c8550894973763080327b3895803aa15d21a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 11:26:11 +00:00
Treehugger Robot
c77a56af57
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: Id1f56b98aaf7fc3d076eb56e54f660a50765352d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 10:55:23 +00:00
Treehugger Robot
a1e66c3aca
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 10:41:07 +00:00
Treehugger Robot
02701dd8b1
Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363
Change-Id: I686382ad702fb8e9fc090ea8441f9a1b3cae0716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 10:03:46 +00:00
Treehugger Robot
d6d6c5c020
Merge "Settings: Fix sometimes reset progress dialog not dismissed"
2022-04-08 09:46:39 +00:00
Bonian Chen
db24551d8e
Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867 am: ee09af716f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486
Change-Id: I07a09e66af72da761d9b04b91c4dc0803ccb049f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 08:28:34 +00:00
TreeHugger Robot
c9fa1a0136
Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod am: 485bfa10b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524
Change-Id: I23cd19c7ba63a21a9530aceb5082d93a821ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 08:27:57 +00:00
Bonian Chen
5839607867
Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev
2022-04-08 08:16:34 +00:00
TreeHugger Robot
485bfa10b7
Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod
...
* changes:
[automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1
Fix keyboard settings crash in multi-user case
2022-04-08 08:03:36 +00:00
TreeHugger Robot
897b72eb1b
Merge "Fix keyboard settings crash in multi-user case" into tm-dev
2022-04-08 08:03:36 +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
Presubmit Automerger Backend
41704f98b1
[automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524
Bug: 216395439
Change-Id: Iac76ec56961b18816d750591654668b95d38e536
2022-04-08 03:05:40 +00:00
Wilson Wu
237a06e0c1
Fix keyboard settings crash in multi-user case
...
We have CL[1] to fix the NPE when keyboard settings
is launched by work app. CL[1] overlooked the work
profile with multi-user case.
Work profile user ID is not available(return null)
when calling Utils#getManagedProfile by work identity.
For work case, distinguish it's running on managed
profile user(launched by work app) or not. And use
corresponding userId as:
-. If it's a managed profile user, use currentUserId.
-. For a owner user, get managed profile userId.
[1]: Iea573922ee789d9932c0de05bf71179c4f005eeb
Bug: 216395439
Test: Manual test with bugs steps
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableVirtualKeyboardFragmentTest
Change-Id: If018d2fddbbcf932927d2235bb8e99393df1e67c
2022-04-08 11:04:52 +08:00
Michael Wright
b111d233cd
Merge "Use more unique ids for safety sources" into tm-dev
2022-04-07 23:44:31 +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
Giulio Fiscella
431acd9dcf
Merge "Use more unique ids for safety sources" into tm-mainline-prod am: 416e5d6f9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17570476
Change-Id: I7cbbedd6757f8af4c33a4e86c4c00f05cd2ef8f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 14:40:25 +00:00
Giulio Fiscella
416e5d6f9b
Merge "Use more unique ids for safety sources" into tm-mainline-prod
2022-04-07 14:17:11 +00:00
TreeHugger Robot
59c849da4d
Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev
2022-04-07 11:47:51 +00:00
TreeHugger Robot
3081690749
Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8"
...
* changes:
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 2p: e1705a25b4
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
Restrict Wi-Fi toggle in Internet Settings
2022-04-07 11:47:51 +00:00
TreeHugger Robot
faad3dfd0d
Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" into tm-mainline-prod
...
* changes:
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
Restrict Wi-Fi toggle in Internet Settings
2022-04-07 11:47:51 +00:00
Arc Wang
e0983d4920
[automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054 am: 2315d0f20e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Change-Id: I0b1c44dec3dd3d22f487fff825d383b2a5ee8536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:54:03 +00:00
TreeHugger Robot
746502e98c
Merge "Hide non-system overlay window on ActivityPicker" into tm-dev
2022-04-07 06:51:35 +00:00
Josh Hou
98490cc740
[Panlingual] Screen title is displayed incorrectly
...
Fix the issue that the screen title name of the app language page is displayed incorrectly
Bug: 227285277
Test: Verify the issue by testing between the system language and app
language page
Change-Id: I5dbb10763bd5cc346bff9c270b14b945eb499273
2022-04-07 14:02:22 +08: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
Presubmit Automerger Backend
e1705a25b4
[automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094
Bug: 203168097
Change-Id: I461037a25eddce597752cc085a8f9ef3942a2767
2022-04-07 04:08:20 +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
Arc Wang
1c8edd20a3
[automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095
Bug: 181962311
Change-Id: I7f99b94832948db188ddd45fd5e2a87ebc28af6f
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:35:48 +00:00
Arc Wang
b95bd5b449
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 11:33:54 +08:00
Arc Wang
2315d0f20e
[automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Bug: 181962311
Change-Id: Ia9438766ed1f6651b52f6e604a243d2be433eb45
2022-04-07 03:20:31 +00:00
Tom Hsu
27b82ddc9b
Merge changes from topic "presubmit-am-f6b1787fd0f3424db0a7a4bb5c8bd472" into tm-mainline-prod am: 94b0789323
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237
Change-Id: I94465169345e13cc62c5eeb2109a9bf989c18cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:04:03 +00:00
Tom Hsu
a9d7aae694
Merge "[Panlingual] Fix the back button press" into tm-dev
2022-04-07 02:52:23 +00:00
Arc Wang
877a41b054
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 10:39:13 +08:00
tom hsu
0ce8355c63
[automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237
Bug: 226894999
Change-Id: I81b99b74f45acdd9f7073aea1d4f5bebd1cd13b1
2022-04-06 15:37:24 +00:00
tom hsu
c0214ff9f3
[Panlingual] Fix the back button press
...
Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
2022-04-06 23:28:17 +08:00