Taran Singh
fa58331cae
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours am: 14f11e845b
-s ours am: 2ac035a723
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Ie5c1b6b77c2f0b6b4bd597885e1062296e5a74d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:47:20 +00:00
Treehugger Robot
f75d9a6e26
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
am: 60da71ecfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Iaedaa236573f184ca5378574fb01cf62178f2f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:27:33 +00:00
Taran Singh
92e234f89b
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
am: 73becab672
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Ic10ce918b2643f0877cb2e468c5391b712116d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:27:29 +00:00
Treehugger Robot
30ea3d3cec
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: Ifbc675e660f46bc43dd1581e21b6e16fc707603a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:43 +00:00
Taran Singh
76f3f2efe8
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I5cfb018ad56154d13a0ff8d610094918e35ea74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:40 +00:00
Treehugger Robot
71bf0d7467
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours am: 2c62993aca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I14e24b0371cbd5bd5380b6f4a4ddf2a40989f472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:09 +00:00
Taran Singh
02ef9c46ec
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: Ifb4be3245cc2129523eff706cb2090902c6a7b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:05 +00:00
Treehugger Robot
9fa4b1e0a6
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev
2023-07-06 21:18:12 +00:00
Treehugger Robot
376bf07767
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev
2023-07-06 21:17:45 +00:00
Treehugger Robot
6cf9c58fa5
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev
2023-07-06 21:15:44 +00:00
Treehugger Robot
25522ce664
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I6fc9be3afa74d954bf2949ba9a4f555905304edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:08:55 +00:00
Taran Singh
eda2ffbeca
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Ifa32ff76702ededcc32e36c975c35db920e343ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:08:52 +00:00
Treehugger Robot
b94d42a51a
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
-s ours am: faa7a8af3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I18d13f6ce7527ea530ed980b2e424a21bcc8cff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:06:18 +00:00
Taran Singh
9f09ec9203
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours am: 14f11e845b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I8ddbba740a4dea4b6da9ee79c7f93b2ca47ab085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:06:13 +00:00
Treehugger Robot
f87cff76ff
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
-s ours am: faa7a8af3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I7672d7a7fd2be3c0fb1b794e57b26d0e270e9dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:05:45 +00:00
Taran Singh
2ac035a723
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours am: 14f11e845b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I840417aa2a6033b66b08c2281e31d12410b0fbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:05:43 +00:00
Treehugger Robot
2c62993aca
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I3fd1ff543e6633ff4141e771bdc24aac9a6de72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:46:31 +00:00
Taran Singh
a8bd8948d1
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I508c24a6e322088a28f3777ec05756818690f73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:46:29 +00:00
Treehugger Robot
60da71ecfb
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I68ecb31f7dc41ff09208bcce533264db9a853ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:43:51 +00:00
Taran Singh
73becab672
DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Icc9e0866bcf0a1f41911c697936d5cb31c4f3b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:43:47 +00:00
Treehugger Robot
faa7a8af3d
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I46d1a6d58214292929bc45c769cca4005c2aa4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:42:59 +00:00
Taran Singh
14f11e845b
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I3abe84b4918e7be076136db9abc4589bf0bd8633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:42:54 +00:00
Treehugger Robot
8e3d6f0a10
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev
2023-07-06 20:35:41 +00:00
Treehugger Robot
fbe97f1ee4
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev
2023-07-06 20:04:21 +00:00
Treehugger Robot
e5f9ab14ce
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev
2023-07-06 19:53:12 +00:00
Hao Dong
d4f621f613
Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042
Change-Id: I8a065cfc1717fbc5036573c8c46cb8eee01c0e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 19:40:14 +00:00
Hao Dong
bee02bbbe7
Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev
2023-07-06 18:45:27 +00:00
Yuyang Huang
83e5cd004f
Enable/Disable ASHA profile with LE audio toggle
...
LE audio has more capability and better quality than ASHA has. When LE audio turned on, ASHA should be off to avoid media streaming profile conflict.
Bug: 287525854
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f79e084bd0a3f9cd332d8218ac040d8c6c60f658 )
Merged-In: I3c5c9012c167b920e484b39374fe8174191b094d
Change-Id: I3c5c9012c167b920e484b39374fe8174191b094d
2023-07-06 17:43:20 +00:00
Tetiana Meronyk
70bdc38d4a
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169
Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev
2023-07-06 13:17:36 +00:00
danielwbhuang
f76c528e5b
Use EXTRA_ENTRYPOINT to log entry point for metrics
...
1. Extra name: EXTRA_ENTRYPOINT
2. Value: integer which is from SettingsEnums.EntryPointType
// access physical keyboard settings through keyboard configured notification entry point
KEYBOARD_CONFIGURED_NOTIFICATION = 0;
// access physical keyboard settings through keyboard settings entry point
KEYBOARD_SETTINGS = 1;
// access physical keyboard settings through connected devices settings entry point
CONNECTED_DEVICES_SETTINGS = 2;
Bug: 271391879
Test: manual and check the device log.
Change-Id: I0d5144790e184eb3374d4615d8874619c372742a
2023-07-06 21:02:30 +08:00
dshivangi
8f4122ad5d
Add 'Stay unlocked on fold' toogle to settings
...
Added 'Stay unlocked on fold' toogle to display settings. Enabling this
setting will allow user to keep their device awake after the fold the
device.
Test: atest StayAwakeOnFoldPreferenceControllerTest LogicalDisplayMapperTest
Test: manual
Built and flashed foldable device and manually tested by
1. unfolded device -> enable setting -> folded device
2. unfolded device -> disabled setting -> folded devices
Built and flashed non-foldable device and manually tested by
1. Went to Settings -> display -> the toogle setting is not visible
Bug: 274447767
Change-Id: I35fbd0f5d1297ee6e14896e8f3be8301cda6622f
2023-07-06 11:42:35 +00:00
Rhed Jao
a357341837
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782
Change-Id: I72588a3e8ff494cd31f72531ada1baef867fb7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 02:51:45 +00:00
Rhed Jao
2070808a62
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev
2023-07-06 02:36:45 +00:00
Quang Luong
e90bb0aedc
Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053
Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d
Merge "Use speed string from WifiEntry" into udc-qpr-dev
2023-07-06 01:49:56 +00:00
Android Build Coastguard Worker
ab0b6f499f
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23768006', 'googleplex-android-review.googlesource.com/23830044'] into udc-release.
...
Change-Id: I390edfa996a68fe74e241aab5ab927a74fd008b1
2023-07-05 23:28:17 +00:00
Michael Mikhail
9a23de2531
Trigger talkback for notification volume change
...
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.
Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6308e3fb2a3ff6bf00bb02b133678fe4fee37f5d )
Merged-In: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-07-05 23:27:41 +00:00
Michael Mikhail
2b49d000b6
Add content description to volume title in settings.
...
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.
Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:499f965c1c79cea14377c37028133a9f8717693d )
Merged-In: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-07-05 23:27:34 +00:00
Michael Mikhail
1ccbd3966b
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 8f88d32f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Iedb8ee79c516ebb582c27f3b6584782c6887fa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:16:59 +00:00
Michael Mikhail
b1c8541600
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: f7b82efb83
am: c2ddd3e581
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I6648eb8daf07a81653d7e5be316239a1e8cec4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:11:39 +00:00
Michael Mikhail
5e9026aa80
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 1db4bc3676
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ie88d511f8c1fb4047a62425e49cd2b120062b5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:11:30 +00:00
Michael Mikhail
c2ddd3e581
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: f7b82efb83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4a9b2877ea13e7bd6ce6d187d416d233141560a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:34:28 +00:00
Michael Mikhail
8f88d32f18
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ia4c82cc1a96ab511fe58aa3747082931304fc68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:33:59 +00:00
Michael Mikhail
1db4bc3676
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Michael Mikhail
f7b82efb83
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: If9ced263d3b60723d39ec471d1e32f800334c046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:47:08 +00:00
Michael Mikhail
83c13d6563
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Treehugger Robot
721efc0ed5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I7e3bcef9a4dc00d76c934ce2c55759089179f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 09:35:31 +00:00
Treehugger Robot
b2f436f310
Merge "Fix test case failure." into udc-qpr-dev
2023-07-05 08:44:06 +00:00