Arc Wang
0e5fca55e5
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
am: f94760e74c
am: 4eafad5f36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I7db8e13335ab5ba25205fcafbddda45adbf17469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 02:07:15 +00:00
Arc Wang
4eafad5f36
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
am: f94760e74c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: Ia4fe33d0b2fa089b84d19abd39d5b61db1a3b4c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:49:50 +00:00
Bill Lin
5b6017febb
Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50
am: 7acf8c21d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709
Change-Id: I1542e4e22b2b8123f282574e193175d77d01d339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:49:31 +00:00
Arc Wang
1cdcca0064
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
am: 5202c0db9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I7224cc93d6057a3afb3b451f5a9b50d6155fcd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:49:21 +00:00
Arc Wang
f94760e74c
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I7aa4104198b2210aad9b65cb5834ebc7eb0e2784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:17:52 +00:00
Bill Lin
7acf8c21d8
Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709
Change-Id: Iaab47c22d99b09b861745f98d7daaf795c8e4637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:17:12 +00:00
Arc Wang
5202c0db9e
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I34d9dbd74d2c11fdd721bb0308920b706065ce9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:16:54 +00:00
Bill Lin
dc9df4db50
Merge "Remove redundant margin from SudContentFrame" into tm-dev
2022-04-20 01:15:18 +00:00
Arc Wang
96491e1ea9
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev
2022-04-20 00:54:15 +00:00
TreeHugger Robot
ac41b7cf1b
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
am: 952408cabe
am: 228c26e21a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: Ie1ff5ede7c7b52b684a63a0c7d4dacf3a3dec9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:53:52 +00:00
TreeHugger Robot
22c5e1088a
[automerger skipped] Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
am: 3f7f5386c5
am: a5d6861390
-s ours
...
am skip reason: Merged-In I4b60bf006bdde9e47b33a52c7719ec770caf5746 with SHA-1 238b2cc721
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I2af9df5b401b3d8921a8580cf867f7b223019a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:48:01 +00:00
TreeHugger Robot
228c26e21a
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
am: 952408cabe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: I5bb7d93944b4c2ce482e178118b59335075b36b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:47:28 +00:00
TreeHugger Robot
6d8c5ea4af
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
am: aed3b7950f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: I7c621a8d3bf46f33f5e283439af49a44d2950cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:47:25 +00:00
TreeHugger Robot
89d8bdd2ee
[automerger skipped] Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
am: 50c155b5f5
-s ours
...
am skip reason: Merged-In I4b60bf006bdde9e47b33a52c7719ec770caf5746 with SHA-1 ad23893e5f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I13affa2224493215648e94eb6f7e3785e32ed1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:46:58 +00:00
TreeHugger Robot
a5d6861390
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
am: 3f7f5386c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I56f2d65fadf3e9a0143e55532f71501a5d804dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:32:23 +00:00
TreeHugger Robot
952408cabe
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: I5bb5e77892ef34b5528a4ea2b419234da1f96350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:26 +00:00
TreeHugger Robot
aed3b7950f
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: Ib53561fb5d6ae2f92663b2262a3c5a178e882568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:26 +00:00
TreeHugger Robot
3f7f5386c5
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I283f489b4422f5cbab61626214e575ac2255d25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:08 +00:00
TreeHugger Robot
50c155b5f5
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I36122846bbb6146f1861f62420d5891c4e05c50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:23:25 +00:00
TreeHugger Robot
883f14f01a
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev
2022-04-20 00:03:18 +00:00
TreeHugger Robot
07950adad9
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev
2022-04-19 23:44:38 +00:00
Abel Tesfaye
238b2cc721
Update auto-rotate strings/toggles for better accessibility
...
This change will update some strings for smart-auto-rotate and replace
the activity based switchbar with SettingsMainSwitchPreference. The
switchbar had to be replaced to allow the new text to appear above the main toggle.
Test: locally with flame and with resolver service enabled & disabled
Bug: 220182618
Change-Id: I4b60bf006bdde9e47b33a52c7719ec770caf5746
Merged-In: I4b60bf006bdde9e47b33a52c7719ec770caf5746
2022-04-19 21:21:34 +00:00
TreeHugger Robot
0b30f03c3c
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
am: 7fe08d0272
am: 7c1f9fbbe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: I4228990a6fd991ce63b473904ed68b11700479e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 18:13:39 +00:00
TreeHugger Robot
7c1f9fbbe0
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
am: 7fe08d0272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: I0c2aac770e289d218d63d8b9d497313f91dae589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:53:10 +00:00
TreeHugger Robot
ebfb2acfd1
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
am: 527f4141a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: Ide570864e6684c7ac27691aba29756c0f6dad757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:51:13 +00:00
TreeHugger Robot
7fe08d0272
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: Ie1367eabc70bdaeace5807ba088b8092556c6137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:29:09 +00:00
TreeHugger Robot
527f4141a4
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: I7daba8645a67bf284a42ad673673c60c10b22c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:28:21 +00:00
TreeHugger Robot
cc27e34330
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev
2022-04-19 17:02:54 +00:00
Yasin Kilicdere
cdc0f7213d
Merge "Revert "Revert "Remove the fallback AddSupervisedUserActivity."""
2022-04-19 15:37:34 +00:00
Neil Fuller
8bdd44b67e
Merge "Fix logic used for auto time zone settings"
2022-04-19 15:21:40 +00:00
Niklas Lindgren
87e2471ab6
Remove config_showOperatorNameInStatusBar
...
config_showOperatorNameInStatusBar has moved to
CarrierConfigManager.KEY_SHOW_OPERATOR_NAME_IN_STATUSBAR_BOOL
Bug: 116847905
Test: Build Product
Change-Id: Ia5e7b5e498ce33ffe58ff922ab3799a1b263a88b
2022-04-19 14:21:38 +00:00
TreeHugger Robot
a0fdba5a46
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
am: 30fb5348f2
am: d3efd93dc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I810d2142ddf430283c49c665bcb07c085f9b31eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 10:11:48 +00:00
TreeHugger Robot
d3efd93dc4
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
am: 30fb5348f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I5e8f1d2bcdf1eea55a839e10b71b0f244881e95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:57:05 +00:00
TreeHugger Robot
58650e8d55
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
am: 2a85dfb5f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I708eff8349c69d441dd6eca5793fa26ffefc8ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:49:34 +00:00
Arc Wang
ea4260c0e7
Fix ManageStoragePreferenceController always consume click event
...
ManageStoragePreferenceController should only consume click
event when its preference key matches the key of the clicked
preference.
Bug: 228970667
Test: atest ManageStoragePreferenceControllerTest
Change-Id: Ia6c62cf457fc4cadc27dc160dbd9b04ec3392d68
2022-04-19 17:35:05 +08:00
TreeHugger Robot
30fb5348f2
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: Ib3cfe231aa6a6250a7840fd187c63a64f26b7da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:34:46 +00:00
TreeHugger Robot
2a85dfb5f4
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I7ecfd7962d090f413c420e44843e64a803afc7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:33:53 +00:00
TreeHugger Robot
0f23863e33
Merge "Fix UiBlcoker regression" into tm-dev
2022-04-19 09:11:51 +00:00
TreeHugger Robot
b0f783b29d
Merge "[Settings] Code refactor for Lifecycle listening"
2022-04-19 08:54:35 +00:00
Tsung-Mao Fang
b7fdf2cb8d
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
am: 9a8167a4a9
am: 4b648f335d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I54252850287d893d1246fa9d04bb8c7ce34d2cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:53:35 +00:00
TreeHugger Robot
11b6efa521
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
am: 7c47ae926d
am: ec8c96f59e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ie709ea8e4881f6829dce58defed68198cafb60dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:52:55 +00:00
Tsung-Mao Fang
4b648f335d
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
am: 9a8167a4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I94de281b1c0c8767dc0f3ecb59486387081bc2db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:31:11 +00:00
TreeHugger Robot
ec8c96f59e
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
am: 7c47ae926d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ia54d8a9bc60bea1816c0e7dd4ab6a8796bc5daf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:59 +00:00
Tsung-Mao Fang
a8d5f8dbc1
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
am: 11979785a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I6992311468464d28114e7aa07e2347fed679060a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:11 +00:00
TreeHugger Robot
12214747b5
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
am: 48086b485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Iaca40b54154e5881443ba403e69c3db8ace5fb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:01 +00:00
Tsung-Mao Fang
9a8167a4a9
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I6ce600c0e41f6457ab38478aba6b5cad8503618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:14:03 +00:00
TreeHugger Robot
7c47ae926d
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ia8fb2c97f7055175085eccf58d25b54364f8a048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:13:55 +00:00
Tsung-Mao Fang
11979785a6
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I76677681736cd4677c5f2b253374bda03b406a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:13:05 +00:00
TreeHugger Robot
48086b485a
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ic75a7db85df442e83a5d34aeb2e1ceb76d36105b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:12:58 +00:00
Tsung-Mao Fang
ccb8855b98
Merge "Do not expose wifi slice when no permission" into tm-dev
2022-04-19 08:12:37 +00:00