PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,705 Commits 1 Branch 0 Tags
2a34e4806980e764f5c40e4d80a2cf85174dfd0c
Commit Graph

103705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
d47388ce79 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 4b02b7dc7d is already in history

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

Change-Id: Ib21fa93721b604e338d7a37add094e28e65ee4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:23:46 +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
783967426b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: ebd68c7887 -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: I431cd90e3d8108e48f6df74d70569ecba74fa8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:44:26 +00:00
The Android Open Source Project
e826459b9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 49f9188b85 -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: Ibcc0840b325b49892161889986d6a99c80e536c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:44:25 +00:00
TreeHugger Robot
403ce6771b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 25f2aa6a3d -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: I002752680216d0ac31658ab2513c524d1c22733f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:44:22 +00:00
The Android Open Source Project
5a5f7e98f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 74cd0c684a -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: Ieafb7a381bbe99c9721c8a04728afdcec60c3b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:44:12 +00:00
TreeHugger Robot
8cacd20ff9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: 7b9337e2e6 -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: I8e8d9e5988e8beff565ad986dc369f68d1396e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:44:06 +00:00
Bill Yi
3e4933f7c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 0cab12760b -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: I60e26b76539f597f4cb905a50f924c2e12202c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:43:56 +00:00
TreeHugger Robot
7603b65c30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 2756f55628 -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: I7ccc9d31a277454d740c459c42f3b34987ffd3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:43:43 +00:00
Bill Yi
414952c8fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: e8c70cb6a2 -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: I545ca5c3e287940afb5f8a82bc80d216698e36ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:43:31 +00:00
TreeHugger Robot
66e3dd58b5 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: 7e3c63dcd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

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

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

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

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

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

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

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

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

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

Change-Id: I387254e861d77a5986238956ae17dbd9bfd620c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:32 +00:00
Chaohui Wang
bf652e736b Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: Id7a976c328f4d18b0e1c55509e18d7275959b894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:41 +00:00
Bonian Chen
129c031930 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I78c11555c80bd7ead868925dc598640af78d6d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:29 +00:00
TreeHugger Robot
2d72c0e67e Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I0a3fce15a10b5d7ee2ab2cc1efd98fc02b6c695c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:24 +00:00
Bill Yi
9825da46ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bfdae40e320f140b44a8a3879d64aed5a377de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:33 +00:00
Bill Yi
b781b9c38d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae86de36449cf9df242d79cec297cdab3d0596e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:18 +00:00
Bill Yi
059234f150 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb037cd0b42f56367d8d909e7d8ebb39adeef567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:59 +00:00
Bill Yi
72fbe398ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83543ee334f01915c02477444bc2222059f73df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:46 +00:00
TreeHugger Robot
97b69588df Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I2c1a1466175300be585c3920c6f9e43e63012a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:19 +00:00
Bill Yi
1fcabe2452 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54bc21e568474fa36f7537c5b4c31707ac7cad0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:07 +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