Yiling Chuang
aa2d3cda43
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: eae022088f
am: 4d263156f8
-s ours am: 89abf5f77e
-s ours am: d4487bb5da
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: If74c27a9227fe95273fdc4a84a7f0f52314feed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:43:23 +00:00
Yiling Chuang
bd140c265c
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb
-s ours am: b0ecfd2b86
-s ours am: 280948fb1c
-s ours am: 32db633219
-s ours am: 5ece21f598
-s ours am: 03213200cb
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: I84f918ad944e37a8c91a0081748193b1295ac8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:43:12 +00:00
Yiling Chuang
401b8e79ed
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69
-s ours am: b3f4ad63ea
-s ours am: 7efbf62816
-s ours am: cfea05b4ca
-s ours am: 764d27437f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: Ic0d6926a198f257df4cef0e63b0839028ef432f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:42:58 +00:00
Yiling Chuang
a110c756eb
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: 5fc9c5c21f
-s ours am: 117fb8c534
-s ours am: 53934236be
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: Ieed0a72829dda590a3dbc9c99653429877c06234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:42:44 +00:00
Yiling Chuang
d4487bb5da
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: eae022088f
am: 4d263156f8
-s ours am: 89abf5f77e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: Ia912431bad12ea12b6cd180e9cdb1814906fadd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:36 +00:00
Yiling Chuang
03213200cb
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb
-s ours am: b0ecfd2b86
-s ours am: 280948fb1c
-s ours am: 32db633219
-s ours am: 5ece21f598
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: Ic9eb1125bfa1368f18b15fbee4aaea041daf5966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:27 +00:00
Yiling Chuang
764d27437f
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69
-s ours am: b3f4ad63ea
-s ours am: 7efbf62816
-s ours am: cfea05b4ca
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: Id062ba8c24f69ddf497eb73edfd3b913744000f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:17 +00:00
Yiling Chuang
53934236be
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: 5fc9c5c21f
-s ours am: 117fb8c534
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: Id29c864ef72e416489be04cc34b51b5ace8926a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:08 +00:00
Yiling Chuang
89abf5f77e
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: eae022088f
am: 4d263156f8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: I93c7078476a71303f2b5c2087125d9b08b882bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:30:01 +00:00
Yiling Chuang
5ece21f598
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb
-s ours am: b0ecfd2b86
-s ours am: 280948fb1c
-s ours am: 32db633219
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: Id22da9e531f4fc7b4c2e09519316db8729c381a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:18:44 +00:00
Yiling Chuang
cfea05b4ca
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69
-s ours am: b3f4ad63ea
-s ours am: 7efbf62816
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: Ief7baf4ddee6a623a009bc73ed9c54143a93e109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:18:27 +00:00
Yiling Chuang
117fb8c534
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: 5fc9c5c21f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: I6b3bcf611cecbfbd8fef97208372449c95dc2405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:18:13 +00:00
Yiling Chuang
4d263156f8
RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: eae022088f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: I223966ef871fa55ecc5a53643f0479327978fe33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:17:47 +00:00
Yiling Chuang
32db633219
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb
-s ours am: b0ecfd2b86
-s ours am: 280948fb1c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: I8ad48df906ece3f82c7746f331fea471b1047208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:01:36 +00:00
Yiling Chuang
7efbf62816
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69
-s ours am: b3f4ad63ea
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: Ia1a1b7e1361a4f3ec5c312a7145edcb45d51b65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:01:23 +00:00
Yiling Chuang
457c0bb4f4
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 6ccef63fce
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550767
Change-Id: I91a524824a498024612dac622ad406a0e715e425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:01:17 +00:00
Yiling Chuang
eae022088f
RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: Ic394804c1f515b4e9a3fd4fae3df77c8d27b116a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:01:14 +00:00
Yiling Chuang
5fc9c5c21f
RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763
Change-Id: I164a16363045bf8ac2bd1a7ce2b77a45812351a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:01:06 +00:00
Yiling Chuang
280948fb1c
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb
-s ours am: b0ecfd2b86
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: I0b5537d0d7a7e20ee181b1a4d3b9187ef37c2640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:00:58 +00:00
Yiling Chuang
b3f4ad63ea
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762
Change-Id: I867bf55f8636c7daf1e5431769e0c3ee5266b9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:00:38 +00:00
Yiling Chuang
b0ecfd2b86
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202
Change-Id: I6165b67d64c40cd44a49aae95f87524f7dbb0228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:00:37 +00:00
Matías Hernández
7a1039fea4
Merge "Overhaul the message senders screen" into main
2024-08-02 12:43:31 +00:00
Allen Su
4bdb1dbcce
Merge "Expand ToA language support" into main
2024-08-02 10:48:30 +00:00
Matías Hernández
a4c99767b7
Overhaul the message senders screen
...
* Fix combinations of messages=all with other conversation values.
* Correctly display policies with CONVERSATION_SENDERS_ANYONE. An additional checkbox is included, but _only_ if the policy has CONVERSATION_SENDERS_ANYONE when shown.
* Changed updateState() to consider the possible cases one by one. Because multiple policies are mapped to the same checkbox states, the strategy of "checking whether the state matches what the checkbox wants to set" doesn't really work.
* Fix messages summary and circles to support CONVERSATION_SENDERS_ANYONE.
* Added a lot of tests (actually, hopefully ALL OF THEM) covering the user-visible behavior. :)
Fixes: 354658240
Test: atest ZenModesSummaryHelperTest ZenModePrioritySendersPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: I727496ca3eb820e4baaab942b61d2e57cdb491fc
2024-08-02 12:36:44 +02:00
Allen Su
a60a38dd39
Expand ToA language support
...
Flag: EXEMPT resource only update
Bug: 328697623
Test: manual
Change-Id: Icbc0c986508065a4daf15e9354e0aa4283315fa9
2024-08-02 09:37:45 +00:00
Treehugger Robot
b6e0cd99c1
Merge "Add whether app optimization mode mutable in BatteryUsageDiff proto." into main
2024-08-02 03:36:39 +00:00
mxyyiyi
59e5dc720a
Add whether app optimization mode mutable in BatteryUsageDiff proto.
...
Bug: 350657779
Test: atest ConvertUtilsTest
Flag: EXEMPT bug fix
Change-Id: I80a5e6513e1bee88f85caeed7661b10204df8a51
2024-08-02 10:41:24 +08:00
Abdelrahman Awadalla
f2d6fe9e32
Add "Touchpad visualizer" to input developer options
...
Bug: 286551975
Bug: 350039816
Test: atest TouchpadVisualizerPreferenceControllerTest
Test: Manual testing using
$ adb shell settings get system touchpad_visualizer
Flag: com.android.hardware.input.touchpad_visualizer
Change-Id: Ic5de704c49aabf1a80d202aa890055f7337d45d4
2024-08-01 13:34:32 +00:00
Chaohui Wang
09fb13fd1c
Merge "Settings search for Vo5G" into main
2024-08-01 07:19:08 +00:00
Chelsea Hao
09f62d72d2
Merge changes Id0882547,I427e08a3 into main
...
* changes:
[Audiosharing] Change text color.
[Audiosharing] When user enters a bad code, apply error color on summary.
2024-08-01 05:50:04 +00:00
Tom Hsu
d26c804af1
Merge "[Settings]Check the Satellite modem state instead of enabled state only." into main
2024-08-01 05:27:06 +00:00
chelseahao
cd6f77d432
[Audiosharing] Change text color.
...
Bug: 356080864
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Test: atest
Change-Id: Id0882547343cb63149f8a9335b023e9f50649e07
2024-08-01 04:25:43 +00:00
chelseahao
e85e1c823a
[Audiosharing] When user enters a bad code, apply error color on summary.
...
Bug: 356071392
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Test: atest
Change-Id: I427e08a3cce8d0e85f29f821d9b779acc95217b1
2024-08-01 04:25:21 +00:00
tomhsu
90553d91f1
[Settings]Check the Satellite modem state instead of enabled state only.
...
Flag: EXEMPT bugfix
Fix: 354806125
Test: Manual test pass
Change-Id: Iaa8d1c9d3df36e40fafda0117234036d9451a4fa
2024-08-01 03:38:48 +00:00
Yiyi Shen
12469371b4
Merge "[Audiosharing] Not announce enable/disable when toggle main switch" into main
2024-08-01 03:05:58 +00:00
Chun-Ku Lin
b656d7b2c4
Merge "Update color correction red-green options text" into main
2024-08-01 01:43:07 +00:00
Chun-Ku Lin
a5636c1cb9
Update color correction red-green options text
...
Bug: 354776203
Test: manually (see screenshots in the ticket)
Flag: EXEMPT resource only update
Change-Id: Iffda7f965e046ef5c6493ac5f9eb410e4db96790
2024-07-31 19:51:42 +00:00
Chun-Ku Lin
1c3cc5bedd
Merge "Physical keyboard related options shouldn't be searchable when invisible" into main
2024-07-31 19:09:06 +00:00
Chun-Ku Lin
767f58785a
Physical keyboard related options shouldn't be searchable when invisible
...
Physical keyboard options category is hidden when there is no hardware
keyboard. It's related preferences are hidden in this case. Hence those
preferences shouldn't be searchable.
Bug: 351047456
Test: manually search "bounce keys", "sticky keys" and "slow keys",
they're not searchable when invisible on Accessibility page
Test: atest
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Change-Id: I1eb465dd34e59d856bb1fa7c06bc253971a8c8d0
2024-07-31 18:04:55 +00:00
Treehugger Robot
e79de39723
Merge "Revert^2 "Tweak Modes layouts and use updated strings to match mocks"" into main
2024-07-31 17:35:10 +00:00
Diya Bera
bc915e7bdc
Merge "Add mandatory biometric prompt to platform surfaces (4/N)" into main
2024-07-31 17:06:14 +00:00
Matías Hernández
4222bed264
Revert^2 "Tweak Modes layouts and use updated strings to match mocks"
...
This reverts commit 9804955ad5
.
Reason for revert: Wrongly reverted; unrelated to the error
Change-Id: I94a2b05589fa80218db184e192f1c4a633ab61b0
2024-07-31 15:45:11 +00:00
ELIYAZ MOMIN
39a56459a5
Merge "Revert "Tweak Modes layouts and use updated strings to match mocks"" into main
2024-07-31 15:40:04 +00:00
Tetiana Meronyk
593f96a559
Merge "Fix toggle when no_user_switch is applied without EnforcedAdmin" into main
2024-07-31 15:11:42 +00:00
Matías Hernández
ff2d85a6fe
Merge "Add new icons to the Modes icon picker" into main
2024-07-31 15:06:19 +00:00
ELIYAZ MOMIN
9804955ad5
Revert "Tweak Modes layouts and use updated strings to match mocks"
...
This reverts commit 0359aaeb47
.
Reason for revert: <Potential culprit for b/356564046 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Change-Id: I980838773078d822d20608e5975a26cf8dbed2be
2024-07-31 14:56:30 +00:00
Tetiana Meronyk
061669815a
Fix toggle when no_user_switch is applied without EnforcedAdmin
...
If EnforcedAdmin is null, calling setDisabledByEnforcedAdmin does not disable the setting. So if this restriction was applied by a source different than admin, the toggle was still active for users to change (even non-main).
After this change, the restriction is correctly processed both when it is applied by admin or by some other source.
Bug: 356387759
Test: atest MultiUserSwitchBarControllerTest
Flag: android.multiuser.fix_disabling_of_mu_toggle_when_restriction_applied
Change-Id: I5d38e250359ccbee67ac747f1d8a0a2143f4c216
2024-07-31 13:55:10 +00:00
Matías Hernández
0b7a22210a
Add new icons to the Modes icon picker
...
Bug: 333901673
Test: atest IconOptionsProviderImplTest
Flag: android.app.modes_ui
Change-Id: I6fa15fa12238eb9c0d1b93803010349b9092812b
2024-07-31 14:12:37 +02:00
Edgar Wang
790fad6df0
Merge "Use SwitchPreferenceCompat instead of SwitchPreference" into main
2024-07-31 12:10:21 +00:00
Yiyi Shen
124a9e1ebd
[Audiosharing] Not announce enable/disable when toggle main switch
...
Fix: 356318679
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I3331f9ded48352f442712287a6b536da883fe73d
2024-07-31 18:56:33 +08:00