Automerger Merge Worker
e5b6d1e219
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours" into tm-qpr-dev-plus-aosp
2022-08-01 17:23:39 +00:00
Bill Yi
2e312fd609
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I7fa2d47c1267092dac9642b0febe9e1cdf58ed45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:22:30 +00:00
Bill Yi
93082d95fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 62fe245c46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I6d1a7698ced5c35d4aacf68bf9bc117491621bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 17:20:55 +00:00
Bill Yi
015915736f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I59274c79e4f571eebd99498d9bafcf6588142c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 16:59:35 +00:00
Bill Yi
62fe245c46
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I0e3092590b7dc1d052a5d6bb4a695dcb7b661cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 16:58:13 +00:00
Jason Chang
88c49e3257
Fix RTL issue on fingerprint setup screens in landscape mode
...
1. Add an RTL layout dimension for enrolling page.
2. Handling device rotation landscape 270/90 degrees with
layout dimension in LTR or RTL language.
Bug: 237104754
Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"
Change-Id: If4770d885d97c6bf4cfebefdf9cfa0b4ee0b995b
2022-08-01 19:02:50 +08:00
Bill Yi
4a547374df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8c471db2d76a88f53565f86acf582afa5fa302f
2022-07-29 15:21:32 -07:00
Bonian Chen
1e744b4e66
resolve merge conflicts of 81d1cd0871
to stage-aosp-master am: 4ec8323bad
am: 244f21d9d7
am: 8097546f46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I0ed7b6a1178d1827079723b7d3283cbb91981b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:43:54 +00:00
Bonian Chen
8097546f46
resolve merge conflicts of 81d1cd0871
to stage-aosp-master am: 4ec8323bad
am: 244f21d9d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: Ifabb14e5aadcbaf55095c5fccea5adabc0da5b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:27:37 +00:00
Bonian Chen
244f21d9d7
resolve merge conflicts of 81d1cd0871
to stage-aosp-master am: 4ec8323bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad
resolve merge conflicts of 81d1cd0871
to stage-aosp-master
...
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
2022-07-29 07:34:35 +00:00
Treehugger Robot
81d1cd0871
Merge "Settings: Make NetworkScanHelper max search time customizable"
2022-07-29 05:37:46 +00:00
Omer Osman
b61e129f35
Add support for selection of Opus in Developer Options
...
Stub implementation for LC3 is added due to the interfaces being
present. The BT stack does not currently implement LC3 over A2DP.
Bug: 226441860
Test: BluetoothCodecDialogPreferenceControllerTest
Change-Id: I40546c97370872b37c0258d10e67a3871f9d9af5
2022-07-29 05:23:55 +00:00
Himanshu Rawat
47f53bd833
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev am: b0a9ebae0a
-s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423652
Change-Id: Ife2e91dc36b658e806fbb8ad93bc59e627350fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 00:54:09 +00:00
Himanshu Rawat
63b0e4d7c9
[automerger skipped] Don't cancel passkey entry pairing autonomously am: dc7aa0e87f
-s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423652
Change-Id: I24e358517dfa629de3e2c936410ae6d254bc5e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 00:54:04 +00:00
Himanshu Rawat
b0a9ebae0a
Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev
2022-07-29 00:27:41 +00:00
Simon Wingrove
59183b0e32
Merge "Bool to note Pending Intent bug fixed" into tm-qpr-dev am: 5d68dd58aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19321786
Change-Id: I6c0058301c05a0faf123216c6df558bcacf388a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 20:40:46 +00:00
Simon Wingrove
5d68dd58aa
Merge "Bool to note Pending Intent bug fixed" into tm-qpr-dev
2022-07-27 20:19:42 +00:00
Julia Reynolds
197091ca8a
Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082
Change-Id: Ie0c44628c38787a16cf055bf5a92c60071f7eaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 13:19:58 +00:00
Julia Reynolds
45bcb214da
Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev
2022-07-27 13:11:50 +00:00
Weng Su
17070ee0c4
Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581fe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394734
Change-Id: If5fbf81277d74626b246338d0e9f3d010805262f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 04:42:53 +00:00
Weng Su
b4ad581fe7
Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev
2022-07-27 04:31:05 +00:00
Tsung-Mao Fang
ec0e4b41f4
Set an action name for wallpaer index am: 0f7b80f47f
am: 68fa74625c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Ica13f797d30a9a5c8c68e93b107b62f89c032f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:22:41 +00:00
Tsung-Mao Fang
fefafaabf1
Set an action name for wallpaer index am: 0f7b80f47f
am: b0f9134441
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Idfbf2786117d7e264b1da6f1101da99db23b76c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:22:00 +00:00
Tsung-Mao Fang
68fa74625c
Set an action name for wallpaer index am: 0f7b80f47f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Id464e7cb46590b003ecb2fab9d73b69fc14fda9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:02:38 +00:00
Tsung-Mao Fang
b0f9134441
Set an action name for wallpaer index am: 0f7b80f47f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Ibcfaa3afcbe2fde0a00c717883c3007bdecb0ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:02:35 +00:00
TreeHugger Robot
b4e676f341
Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev am: bcfe28d0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749
Change-Id: I6608b83db79c615c66915f9b4bec0e670758fcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:37:10 +00:00
TreeHugger Robot
bcfe28d0a9
Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev
2022-07-26 15:42:37 +00:00
Julia Reynolds
397c885c46
Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19419547
Change-Id: Ib22e2fc711b81772e7ddbafd786181bf694b46d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 15:13:06 +00:00
Julia Reynolds
6a110b91f8
Merge "Revert "Improve App notification loading"" into tm-qpr-dev
2022-07-26 14:56:20 +00:00
Himanshu Rawat
e379ccfff2
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
am: 7c6a004452
am: 99bbb571f3
am: 8fc819f87a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I5d5ca2f1721ec6cf53c37eb37e150acf5ef4411e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 04:11:07 +00:00
Himanshu Rawat
8fc819f87a
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
am: 7c6a004452
am: 99bbb571f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I7e51117d355b763c0f3d299864cb40dabed90c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 03:44:20 +00:00
Himanshu Rawat
99bbb571f3
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
am: 7c6a004452
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I1fa257f586e109a15aa1a26f9153ddcc6ba5b866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 03:18:47 +00:00
Himanshu Rawat
c2b402bd50
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80
)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:38 +00:00
Himanshu Rawat
dc7aa0e87f
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80
)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:36 +00:00
Himanshu Rawat
d668a888f0
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80
)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:18 +00:00
Tsung-Mao Fang
0f7b80f47f
Set an action name for wallpaer index
...
Since Android T+, app has to assign an action name for opening a
external app page.
Test: Manual test wallpaper search result and can open.
Fix: 239867167
Change-Id: I4579aaf6e831ff82721c958e6b91ede4cabda2c8
2022-07-26 02:36:13 +00:00
Himanshu Rawat
7c6a004452
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I7680942ca7ac5da3799b10306b1a3849800a1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 02:17:18 +00:00
Himanshu Rawat
059ab284e7
Merge "Don't cancel passkey entry pairing autonomously"
2022-07-26 02:00:52 +00:00
Bill Lin
008f70c249
Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732
Change-Id: Ib149edd918076d46f98d657169e13bc2d34cdef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 01:17:02 +00:00
Bill Lin
483c9b7206
Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev
2022-07-26 00:45:37 +00:00
LuK1337
988a76f5bb
Settings: Make NetworkScanHelper max search time customizable
...
Default max search time (300) fails on some devices.
Test: Network scan works on OnePlus 9 after overlaying
max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
2022-07-25 17:44:40 -07:00
TreeHugger Robot
6a8f459e6c
Merge "Send metric intent back to SUW" into tm-qpr-dev am: 587da7dfc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19378812
Change-Id: If60a5eacd90ba186423183da0883d1252309d825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 22:41:04 +00:00
TreeHugger Robot
587da7dfc3
Merge "Send metric intent back to SUW" into tm-qpr-dev
2022-07-25 22:18:04 +00:00
Neha Jain
c5f1cb11e0
Revert "Improve App notification loading"
...
Revert "Fix binder error when an app has many channels"
Revert submission 19290255-jr-bind-flicker
Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels
Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
2022-07-25 22:16:16 +00:00
Julia Reynolds
e4dc6c972f
Only show the channel toast if users expressly ask for it
...
Test: NotificationChannelWarningsPreferenceControllerTest.java
Bug: 231150048
Change-Id: I4797a2184561ae3dcd03e62bfb78a90686458c6b
2022-07-25 19:39:49 +00:00
Weng Su
8b1e21f929
Restrict WifiScanModeActivity for guest user
...
- Don't show WifiScanModeActivity if the user is a guest.
Bug: 235601169
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanModeActivityTest
Change-Id: I8f1d162d9b15116c3deb3656b9af6851d4514947
2022-07-26 01:48:16 +08:00
Julia Reynolds
cf3fc8d0b5
Merge "Move zen rule deletion" into tm-qpr-dev am: 7ab7c1d6f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19377234
Change-Id: I25fdf9997ff4fe2dc97577e709f20df32317e10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 17:33:36 +00:00
Peter Zhang
179c4dd48a
Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450
Change-Id: I7f3ea617800c37f49d8534131728875c0cd1d243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 17:33:08 +00:00
Julia Reynolds
7ab7c1d6f8
Merge "Move zen rule deletion" into tm-qpr-dev
2022-07-25 17:24:42 +00:00