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
Hao Dong
069c7ec1a9
Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7
am: d4f621f613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042
Change-Id: I62010625ecb3be7b3d6d76c79b0f051cc91a2357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:18:47 +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
Chun-Ku Lin
79ffa2a45f
Merge "use L10n-friendly runtime number formatting based on locale" into main
2023-07-06 17:09:25 +00:00
Tetiana Meronyk
de9efe778b
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
am: 70bdc38d4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169
Change-Id: Ifccee75d893bba0de3814a18b68eb0f32d6d0da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 14:41:45 +00:00
Iván Budnik
fdcdca616d
Fix adjust volume call on MediaDeviceUpdateWorker
...
Volume adjustment for MediaDevice is now available through
LocalMediaManager. This is a non-functional change.
Test: Presubmit.
Bug: 192657812
Change-Id: I1f85f4b914c00b7075daa9be52b34e63836df8e3
2023-07-06 14:26:53 +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
Chaohui Wang
9ed6eccb75
Remove context from batteryStatusFeatureProvider
...
BatteryStatusFeatureProvider is created by using application context,
no need pass context in when get.
Bug: 286764889
Test: m Settings
Change-Id: Ie5f39c3f074a1937526461eba45f11f7ec212cba
2023-07-06 15:56:08 +08:00
Treehugger Robot
b3b27451a3
Merge "Make wifi calling slice consistent" into main
2023-07-06 05:45:18 +00:00
Treehugger Robot
e761690e08
Merge "Clean up assist gesture from Settings" into main
2023-07-06 05:42:20 +00:00
Treehugger Robot
b41e910e10
Merge "[Terms of Address] Add new strings of Terms of Address" into main
2023-07-06 05:31:02 +00:00
Zoey Chen
56c9081f2d
[Terms of Address] Add new strings of Terms of Address
...
Bug: 289489649
Test: manual
Change-Id: I066f1163141bf1e775e29b862c57faf761869a18
2023-07-06 04:13:36 +00:00
Rhed Jao
b889744aa0
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62
am: a357341837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782
Change-Id: Ifa2f36ed8d30e68c99fc982dbcbf24f38fed261e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 03:11:35 +00:00
Quang Luong
42f6baa67a
Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
am: e90bb0aedc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053
Change-Id: Ia136e2a699a32d55a7566bc8143ed7396e848326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 03:08:39 +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
Mill Chen
fbe8e9f571
Make wifi calling slice consistent
...
The wifi calling search result is grayed out if it is not using
carrier WFC. In order to ensure the search result is aligned with the
corresponding settings, the checker of wifi calling slice will be the
same with wifi calling preference.
Bug: 285594611
Test: manual test
Change-Id: I22d794332a0cc2ecbcb8b5e8836364e926400cbf
2023-07-06 02:41:02 +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
Michael Mikhail
3411c09fa9
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 8f88d32f18
am: 1ccbd3966b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ib2b30c78237f0484a6d2c30f92c7cf9100f2c372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 01:15:15 +00:00
Michael Mikhail
804c6233b5
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: f7b82efb83
am: c2ddd3e581
am: b1c8541600
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I26abbaae0e04a29e21b77873eb6dab2c39876f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 01:05:46 +00:00
Michael Mikhail
9d65dffe80
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 1db4bc3676
am: 5e9026aa80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4427ef728c7210ffd6c837a696f54e75737cb6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 00:30:15 +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
3e124e4137
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 4396612e11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ia56bdb9a1f9d9acdc078e8068ca5585a68f6bb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:30:05 +00:00
Michael Mikhail
4cd35efb10
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: baf891b44b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4921ba145ce81a7e39378af619f0e7c15e8ae4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:29:55 +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
4396612e11
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: I383efa35bb4abf9f4527a812c2c97c940185f5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Michael Mikhail
baf891b44b
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: If5494bc98dc2acc69c2de7045e1763c2228f5286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:08 +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
Chaohui Wang
8c37af5ed1
Merge "Use DataUsageLib in DataUsagePreferenceController"
2023-07-05 15:24:45 +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
bc47f1aac5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
am: 721efc0ed5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I504ea6842af716ef73468b7e7789c983f5e3a540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 10:17:37 +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
Yi-Ling Chuang
434a04b32c
Fix test case failure.
...
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.
Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
2023-07-05 15:43:34 +08:00
Jason Chiu
8ecbe486f8
Merge "Do not finish activity when the input account doesn't exist"
2023-07-05 07:15:22 +00:00
Patty Huang
627a584f39
Do not show LE audio toggle in Device Detail by default
...
Bug: 289884263
Bug: 289957406
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is not shown in Device Detail by default
Change-Id: I2c6430c791dd852d238d7122a72f218f395c4a0b
2023-07-05 11:51:50 +08:00
Chaohui Wang
225af2b43f
Merge "Remove context from getSupportFeatureProvider"
2023-07-05 03:37:55 +00:00