SongFerng Wang
782bb2f069
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268
Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 09:29:21 +00:00
SongFerng Wang
d911a095eb
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev
2023-03-20 08:59:12 +00:00
Betty Chang
0fd1625895
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I704c81ac2d045142be5c7cc1835efa6d46cd2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 07:35:52 +00:00
Betty Chang
1de44c2447
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I3747bf58a841c0c0213d6b27525d9aee992f85bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 06:59:18 +00:00
SongFerngWang
88717f2c3f
Avoid ANR when UI query network selection state
...
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.
Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
2023-03-20 14:42:18 +08:00
Betty Chang
18eb985e41
Merge "[LE Audio] To remove the broadcast source item that created by receive state"
2023-03-20 06:33:42 +00:00
changbetty
85dd572f18
[LE Audio] To remove the broadcast source item that created by receive
...
state
- When the user clicks another broadcast source and wants to join,
we will remove the previous item that created by getAllSource().
And trigger the search again.
Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
Merged-In: I416f0a39e31276876e63360664555f99dd7297c9
2023-03-20 05:48:34 +00:00
Bill Yi
239e6fb371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: I1ca121ca22fea96d7e31a26814f1d37a3718f44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:46 +00:00
Bill Yi
11970fc875
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: If014a60d0905d772a9b86e6ead2abb604c1bb726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:35 +00:00
Bill Yi
fe39800ae9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: If3b0bc9aa7a005b7a408628254ab71028bec9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:22 +00:00
Bill Yi
d4b4e93227
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I3937a3f3b9fe3b0f28f18118bf38fec03ed22256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:47:59 +00:00
Bill Yi
77b98813c3
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-19 20:02:05 +00:00
Bill Yi
5f0516e69b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-19 20:02:05 +00:00
Grace Cheng
59992bbbb8
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565
Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev
2023-03-18 06:18:32 +00:00
Darrell Shi
2119a2dcf9
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev
2023-03-17 15:47:23 +00:00
Bill Yi
71e954c78b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79c7f425dac1cd278eface63dc0c3702616bfc88
2023-03-16 20:45:10 -07:00
Bill Yi
82c23db452
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
2023-03-16 20:40:36 -07:00
Menghan Li
2600b1bbc2
[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737
-s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I204ee5dc7a8861b51d06420c6bb1d4ff7b216c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:59:03 +00:00
menghanli
6f478f1a6b
[automerger skipped] Update color-check-baseline.xml am: 796fcccd9b
-s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I6a67de10b42d08b3786b01928377d020c8513630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:58:48 +00:00
Menghan Li
1306ebf737
Merge "Update color-check-baseline.xml" into tm-qpr-dev
2023-03-16 20:29:25 +00:00
menghanli
796fcccd9b
Update color-check-baseline.xml
...
(Fixed according to the instructions in prebuilts/checkcolor/README.md)
Bug: 273556105
Test: repo upload checks
Change-Id: Iaf4ab9f6cc1c836348226bc36358cbb73d2583d2
Merged-In: Ife355166df080ce7371a95b5cea28575227153f0
2023-03-16 02:29:38 +00:00
Dmitry Dementyev
c03f2fe49c
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
am: a3d15a91e1
am: 92babcaef5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ib6464d437f7b2ead5cd9b00f13431149979ff8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:11:46 +00:00
Dmitry Dementyev
92babcaef5
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
am: a3d15a91e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Id32c9274ed8290b709328924d698dbdf130b8d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:55:00 +00:00
Diya Bera
ed1bb20ff1
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586
Change-Id: I190752b9c2a65024c140b7dab92524097c183ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:52:07 +00:00
Diya Bera
f7359a5001
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev
2023-03-15 22:28:10 +00:00
Dmitry Dementyev
a3d15a91e1
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I33ee7b0b3fd191ed993a3537d598d102c2d6ffb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:18:42 +00:00
TreeHugger Robot
bc3053ca51
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793
Change-Id: I1ad68d1100681f6df21668d62485f9f29f9c4d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:45:00 +00:00
Bill Yi
350628d706
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793
Change-Id: I59b1204fb9eba20091d3033860819796c1ca58a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:57 +00:00
TreeHugger Robot
053aec9616
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: Ia29ddec60f6c08bf86280b31f3329f9327cc0d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:47 +00:00
Bill Yi
89ec1ab87e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: I61380c2773ea05dcac939334bad338e4dd8c52b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:10 +00:00
Dmitry Dementyev
9bec974991
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:34:39 +00:00
TreeHugger Robot
827333d9b6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-15 21:24:10 +00:00
TreeHugger Robot
70bb56cb83
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-15 21:24:10 +00:00
Dmitry Dementyev
7f73a168fe
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:01:01 +00:00
Dmitry Dementyev
4f67ca0cfa
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:39:21 +00:00
Dmitry Dementyev
f56584cd21
Convert argument to intent in AddAccountSettings. am: c7e8052b52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:01:57 +00:00
Julia Reynolds
ce0c1c4de7
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I90173ce86cc356ba97e4ff51dffd6b6588bb0c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 14:27:39 +00:00
Julia Reynolds
7626600bbf
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev
2023-03-15 13:59:23 +00:00
Diya Bera
4ffddaa19f
Remove subtitle from biometric prompt in Settings (Passwords & Accounts)
...
Bug: 250064171
Test: Manual - repro according to bug
Change-Id: I5896c3cec13d65093fa928db042952045269b93f
2023-03-15 04:17:50 +00:00
Bill Yi
a73552148b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idd94e1c8ca5d1a8f1c46786e83d83a3d6b68493c
2023-03-14 19:12:19 -07:00
Bill Yi
1de90287e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e52a4acd3f0f22fdc54abc909035f70d82173e9
2023-03-14 19:03:27 -07:00
Grace Cheng
a796202f11
Update locked device icon in FingerprintEnrollIntroduction
...
Changes locked device icon in FingerprintEnrollIntroduction to be form
factor agnostic
Test: (manual) navigate to FingerprintEnrollIntroduction and observe new
asset
Fixes: 268588691
Change-Id: I747a52319671c7b0f337f0a1c39a529da65b3f43
2023-03-15 01:07:26 +00:00
Xin Li
7e131d0b94
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e
-s ours am: dc399ade52
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Idf60779f799c604ace73767b0483a609e861b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:08:02 +00:00
Xin Li
8d7a6eb577
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c
-s ours am: d19379e607
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I4932292d3c8047b7eddac3c878e5f237ba510a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:06:01 +00:00
Xin Li
dc399ade52
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I35578d54aa72f7abf031eba8873a14e4ccf9a54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:35:18 +00:00
Xin Li
d19379e607
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Ideb892316ec21740723c3d5f06a1b3904f34c3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:32:04 +00:00
Lucas Silva
5671ddb191
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:54:01 +00:00