PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,863 Commits 1 Branch 0 Tags
bf6d1965b7e3d98c5d442963c141c39dfd3ae616
Commit Graph

102863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
bf6d1965b7 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours am: 1a352ac71c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305

Change-Id: Ib518dd4a4e4a85bab086cbe21b6416774850ea9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:45:38 +00:00
Arc Wang
3478713e2f [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: I4670b8531801aaab2e157089e66cc4f0883536b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:45:26 +00:00
Arc Wang
92d39fe026 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours am: ad75641b27 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: I491b2b6b08b6182eb16d6544195b9562d8dc94fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:45:25 +00:00
Arc Wang
868417c5ac [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219303

Change-Id: I066202df1a2281ca2ca780afedd89eb737756537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:45:18 +00:00
Arc Wang
c8d76ad2ef [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219302

Change-Id: I11896b6a1b3ea6c315a5ef0c01aa296078a2f194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:44:15 +00:00
Arc Wang
5167d5ff4d [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219302

Change-Id: I1a1e2aefa66f380f92f07e1cd9ab438c15f117c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:44:14 +00:00
Bill Yi
6a9ed355c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214809

Change-Id: I343624030f95e24f5454dcbe38993cc7b27da92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:26:04 +00:00
The Android Open Source Project
71d9d870a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214809

Change-Id: Ib4e47c802d0b2d560245ad7bd6f2b0154ab1564d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:25:50 +00:00
Arc Wang
1a352ac71c [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305

Change-Id: Icff574bec45076626c2f733f80b5bc86ed33397b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:21:43 +00:00
Arc Wang
dbd9eafd30 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: Id5976b520e569dc4fb65a5d3bf9e7ef33af91182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:21:34 +00:00
Arc Wang
ad75641b27 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: I5577b88e2de2c26106838d8617a0f2876aad0b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:21:32 +00:00
Arc Wang
b3dd21bf61 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219303

Change-Id: I2fbe33253b14dbab92ac60fe1a91a1982e308014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:21:23 +00:00
Arc Wang
c0e620bfb4 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219302

Change-Id: I52ac19a60e973fcb4afb8c28e2a5708c31251b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:21:04 +00:00
Arc Wang
25424a980d [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219302

Change-Id: I62e76d6392931f44c7279cdfe9d339632a47b59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:21:01 +00:00
Bill Yi
2257809a29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214809

Change-Id: I8e1206a8f979654348f1425c2a2479d12e12db41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:16:54 +00:00
The Android Open Source Project
ecd69b95e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214809

Change-Id: I28522223ba08f62402b51732e23f8ae90bde407e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:16:39 +00:00
Qasim Javed
01f4cbf40a Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18285591

Change-Id: I5f2a7771c8078684aac2346ca8c1c0da5c1b59d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:45:59 +00:00
Arc Wang
4464225492 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305

Change-Id: Ibd3d66374402289dbde12c11273bc04820535f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 01:10:17 +00:00
Qasim Javed
94a97b6c59 Merge "Only cancel bonding if pair button is not pressed" into tm-dev 2022-05-11 01:08:01 +00:00
Arc Wang
1e252c20eb [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305

Change-Id: I67d90409411a2fe24889d247170004db69533f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:43:42 +00:00
The Android Open Source Project
d6c71eeac6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214813

Change-Id: Icabbd8e495e2e8cb807740d46f4c2c6fc831a716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:37:30 +00:00
The Android Open Source Project
249269c95d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214813

Change-Id: I471c5812af4b17c7a489c70ef3e9e45291b6b0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:27:54 +00:00
Arc Wang
3d0398f88f [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: I7a99f6807e442a57bf144846f17b9f8cdf4b1a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:36 +00:00
Arc Wang
e92949a3f8 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: Ib5067bd5ebaa50758caa215837c8fa40b2d3ffe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:35 +00:00
Arc Wang
ac534873d3 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: I0acfc40d6b5ec0b685f5500ec2a2108fe3ad88dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:29 +00:00
Arc Wang
21427989dc [automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Change-Id: Ic9f13dd1f7f0e7cc7d15303b0c109bf2cc6c5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:28 +00:00
Arc Wang
c0470839f1 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219303

Change-Id: I1993a307bccaecebf5366782a5c67253fcebfe70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:18 +00:00
Arc Wang
bb81ea5351 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305

Change-Id: I9340565fe25db91bb87566a028ea7238904138c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:23:55 +00:00
Arc Wang
d5cec0f5b9 Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev 
* changes:
  [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
  Verify ringtone from ringtone picker is audio
 2022-05-11 00:04:32 +00:00
Arc Wang
8fba3eef08 Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev 
* changes:
  [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5
  [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
  Verify ringtone from ringtone picker is audio
 2022-05-11 00:04:32 +00:00
Arc Wang
3c2f252e62 Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev 2022-05-11 00:03:10 +00:00
TreeHugger Robot
ebd68c7887 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812

Change-Id: Id1074dbb5ee46af25e668c3058130c8fad4e8714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:38:12 +00:00
The Android Open Source Project
49f9188b85 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812

Change-Id: I49110897650614d83c2c5c6ddea972150da362e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:38:00 +00:00
TreeHugger Robot
25f2aa6a3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808

Change-Id: I89b4729cb4c561ea3fc7e77de804aabcd1e95a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:37:57 +00:00
The Android Open Source Project
74cd0c684a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808

Change-Id: I485a40510b88e7866fd4e12769f59b845343abd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:37:52 +00:00
TreeHugger Robot
7b9337e2e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279

Change-Id: I35a7f00ace03cb0495ae8b09b48b1aa92f13512c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:37:41 +00:00
Bill Yi
0cab12760b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279

Change-Id: Id98e14acd4e7aee5dc1442fac1b4045d8042cfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:37:29 +00:00
TreeHugger Robot
2756f55628 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272

Change-Id: Ic76f60f0aded69baebbec817d5f633fd53180b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:37:15 +00:00
Bill Yi
e8c70cb6a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272

Change-Id: Ibe1d5e310a5d20de52aed2db5c6df8c97ec65682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:37:03 +00:00
TreeHugger Robot
7e3c63dcd5 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: I550583e2fa4ba4c113760ca41caee4f499d76929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:33:52 +00:00
Bonian Chen
2a1040e1e2 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: I1a7d0cd2e38b39da2b1873b2cb6161d5a50abb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:33:40 +00:00
Yanting Yang
799f7218cd Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I4875344328bc68d8ca069ed15f71aa8ce4abef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:33:30 +00:00
Martijn Coenen
d77f3426a2 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I6e942c241c734314246623b7521af6ebf9d2896c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:33:13 +00:00
Menghan Li
efdfca87d8 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: Ia0b96f37f3db8e080f181265862a960dc0e748da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:32:57 +00:00
Tsung-Mao Fang
7e6dd3f4b7 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I97fb5d351bea43b6e7210bb856cd5c89d4ddc3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:26:40 +00:00
Bonian Chen
7dcd7194b4 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: Ie03543a38e7aee8b78e888ff842b1e807e953c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:26:18 +00:00
TreeHugger Robot
24a2986cfa Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I8cebf257ad475a63577b0adae5e23c89b65bfe2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:26:10 +00:00
SongFerng Wang
2c7794515d Merge "Reuse the active esim slot" into tm-dev am: b1613b210d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I4be1c5c74c1a64b17e8fb6903ccc3aee0e962c81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:25:43 +00:00
Chaohui Wang
d6a9c62ff9 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: Idbe08655bb07d19a2d9a0ee86845241d0c6659c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:25:36 +00:00
Qasim Javed
29b7f1d5fa Only cancel bonding if pair button is not pressed 
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.

Only cancel bonding if the user did not press the pair button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed

Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
Merged-In: I868af9b795f1bb0766656e4619bd06dc8028008a
 2022-05-10 12:03:33 -07:00