Arc Wang
671fa153e8
Merge "Crash happens if back button is pressed during "Format as Portable""
2022-08-02 03:11:13 +00:00
Himanshu Rawat
47f97471a2
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: 27ce614bf2 -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/+/19423969
Change-Id: I06b25f57987d0fe989e685058728574e9146f3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:18:24 +00:00
Himanshu Rawat
225958b5b9
[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 6076d3acc2 -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/+/19423969
Change-Id: I6667d097a83ba4572f34786225fe6e6f4cbd1a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:18:11 +00:00
Himanshu Rawat
67f88122a1
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours am: c6d15199d7 -s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969
Change-Id: I61f476145079fc1c972b5b9dbf3ba95dbfdf3bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:17:54 +00:00
Himanshu Rawat
f56b361567
[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours am: 5dd2f5e3ee -s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969
Change-Id: I3e258177d5ffd9802279dc74032992fb7981f479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:17:51 +00:00
Himanshu Rawat
27ce614bf2
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -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/+/19423969
Change-Id: I0ea9b45a24b621b6d2496bc394dd5036309fa6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:17 +00:00
Himanshu Rawat
6076d3acc2
[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -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/+/19423969
Change-Id: I8c5189fccea87548e4395ae69f6fdb325377e5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:16 +00:00
Himanshu Rawat
c6d15199d7
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df -s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969
Change-Id: Ibf7d266960a44c030e707282b04b693627c21197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:14 +00:00
Himanshu Rawat
5dd2f5e3ee
[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969
Change-Id: Icd75fc8def2e27698b2ee0d2f9b622d5cb7c3f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:11 +00:00
Himanshu Rawat
221c09d8df
Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev
2022-08-02 01:41:58 +00:00
Android Build Coastguard Worker
da217f3860
Snap for 8892748 from 62fe245c46 to tm-qpr1-release
...
Change-Id: I7f25d0075f54e03c858e2ebac47da4a901171acb
2022-08-01 23:25:48 +00:00
Lucas Silva
254f62cb71
Move "when to dream" settings upwards for greater visibility
...
Fixes: 240752634
Test: locally on device
Change-Id: Ie705ada02cee0c839f9c9e5ed1cffd448580fb00
2022-08-01 16:06:23 -04:00
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
Android Build Coastguard Worker
66fc0c7a32
Snap for 8887382 from b0a9ebae0a to tm-qpr1-release
...
Change-Id: I104fadaaddcd1d98f99aa5b6d196a241c190cf15
2022-07-30 01:25:27 +00:00
Android Build Coastguard Worker
79eeb2d79a
Merge cherrypicks of [19034069, 19194541] into tm-release.
...
Change-Id: I5fe69b3f90b8feea172d4e5962844731a457fe70
2022-07-29 22:36:59 +00:00
SongFerngWang
34dac9cb73
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM
...
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.
Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.
Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
(cherry picked from commit 286dce6b6e )
Merged-In: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-29 22:35:50 +00:00
Jason Chiu
8cef068117
Make bluetooth not discoverable via large screen deep link flow
...
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.
Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.
Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
(cherry picked from commit 5df14831b8 )
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-07-29 22:35:44 +00: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
Oli Lan
c0742e745d
Revert "Prevent exfiltration of system files via user image settings."
...
This reverts commit 8950a90024 .
Reason for revert: regression if multiple crop system crop handlers are present
Change-Id: Ib83dbb2f1109d26b7e85192379291bffef187e77
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2022-07-28 12:14:14 +00:00
Android Build Coastguard Worker
04d64054c9
Snap for 8877244 from 5d68dd58aa to tm-qpr1-release
...
Change-Id: If90c475d849b3ccf03f0efcd81f8cda0f0f1d268
2022-07-27 23:30:16 +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
Android Build Coastguard Worker
482a316b01
Snap for 8872621 from bcfe28d0a9 to tm-qpr1-release
...
Change-Id: I0e214ed6d6ca5d3573dedd29a682b8fa836ff9ff
2022-07-26 23:26:05 +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