Karishma Vakil
f8fe3d4bcc
Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283
Change-Id: I15be0aedfcc4e4555233af0a85cd55c3f85bd0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:20 +00:00
Chaohui Wang
95cb923575
Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782
Change-Id: I9dad3f09aa72baa927e6825f263f86cd35098a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:07 +00:00
TreeHugger Robot
87d7e0f59a
Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561
Change-Id: I0e19f735e70359c892d89bbaa35fe4da4ca55e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:55 +00:00
TreeHugger Robot
168534ecb4
Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244
Change-Id: I18094e0de30ce9b605c0c2c0f8a36b28ddef4fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:40 +00:00
Becca Hughes
6dbc9554da
DO NOT MERGE Live update cred man settings am: d8b74b5c39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746581
Change-Id: Iba0353004c19f07c7a4c2fe2df76dbbc5575a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:25 +00:00
Bill Yi
c95d152465
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886
-s ours am: 3e8d5a6747
-s ours am: c205fe957a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Ief00d248c5dfb27e44d8027f081bb3c9293a2436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:07 +00:00
Julia Tuttle
57b70c2c01
Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610
Change-Id: I11dc017536371d527f618eddeea8731722574ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 19:45:53 +00:00
Bill Yi
33b6de4b50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570
-s ours am: 34a76b5ade
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I2996adf1a93bf975ab6e3f9f4df2fb5d9ed53b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 18:32:07 +00:00
Bill Yi
78d96018c9
Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85
am: 436870a9f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: I974e15599a60efda9a749d8c9bed165e9a302d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 17:50:59 +00:00
Bill Yi
3a1d44e582
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
am: 7fc6abdfb9
-s ours am: c173d9de53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Ic726f49647ad0851937a3be3eabe33d5a8292083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 17:50:44 +00:00
Diya Bera
7d251f4c51
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
am: 8a31106496
am: 6fbfec99c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: I92078b6f886ed54b98bd3a6d599f4acff6a5be1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 17:00:55 +00:00
Bill Yi
23dd8c5b22
Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I15a16907ba83d1e459f2a73c5363d831186dfc4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:56:56 +00:00
Bill Yi
07fbea7627
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
am: dc1e24b89e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I719377fc2b61fd3f8d847dd75ed2a8d8777c6892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:56:47 +00:00
Karishma Vakil
85e5174132
Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev
2023-04-20 04:04:19 +00:00
Chaohui Wang
ac2dc8dd01
Merge "Fix button label missing in the SIM card pop ups" into udc-dev
2023-04-20 03:39:23 +00:00
TreeHugger Robot
d21225790b
Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev
2023-04-20 03:34:29 +00:00
TreeHugger Robot
fb52240afe
Merge "Fix RTL display problem in Open by default" into udc-dev
2023-04-20 01:59:00 +00:00
Karishma Vakil
151d3deed2
[Safety Labels] Enable safety label change notifications flag by default
...
in Settings code
Bug: 261249312
Test: atest CtsPermission3TestCases
Test: atest AppDataSharingUpdatesPreferenceControllerTest
Change-Id: I34da5e4d140731b00749c89f8b328a2f2cb93e61
2023-04-19 23:50:57 +00:00
Becca Hughes
d8b74b5c39
DO NOT MERGE Live update cred man settings
...
This CL will enable live update of credential
providers if any are added/removed.
Test: atest
Bug: 264420106
Change-Id: I14804bac17a4efe5eccd3c5824558eace18da186
2023-04-19 22:06:15 +00:00
Bill Yi
c205fe957a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886
-s ours am: 3e8d5a6747
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: I8afd73501167ef8dd7c6ed3c01dc66a2dfc678cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 19:46:09 +00:00
Julia Tuttle
8af4cf48ea
Merge "Clarify full screen intent permission text" into udc-dev
2023-04-19 19:00:37 +00:00
Bill Yi
3e8d5a6747
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: I54ba4dacd8d625dde04b8fcf72ac7131b6d498f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:44:39 +00:00
Bill Yi
34a76b5ade
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I8708ea492ca3c6534ff43d95fae2379304c79a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:25:57 +00:00
Bill Yi
436870a9f8
Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: I18e3868170489566921fc1d8cfed9b135739831e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:19:06 +00:00
Bill Yi
c173d9de53
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
am: 7fc6abdfb9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Idf57fa8698bf03665f9588a3182729cff63192c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:18:23 +00:00
Bill Yi
7d7a461c85
Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 17:59:19 +00:00
Bill Yi
367bedb886
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-19 17:59:16 +00:00
Diya Bera
6fbfec99c8
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
am: 8a31106496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ie1505f0272340b867648341bfe01f26e948f14b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:54:50 +00:00
Bill Yi
b660ca5570
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-19 17:44:26 +00:00
Bill Yi
ddff8a4b4d
Merge changes from topic "tc_change_23041807_28" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 17:44:25 +00:00
Diya Bera
8a31106496
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ibfc5a6684f98c842f95f5cb125310d89a0035644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:39:42 +00:00
Diya Bera
49ea4e5d22
Merge "Adding owners" am: b1aabec0db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ib03f9e473201e6a826cb7810e32b00ad1e3da965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:11:26 +00:00
Diya Bera
b1aabec0db
Merge "Adding owners"
2023-04-19 16:30:18 +00:00
Pavel Grafov
bb2fc30381
Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501
Change-Id: I0049956a36017b0de9c7c27bd1aeaec64923f13a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 13:30:47 +00:00
Pavel Grafov
b8d639c8fe
Merge "Fix uninstall button can't click problem" into udc-dev
2023-04-19 12:50:27 +00:00
Milton Wu
3024352f85
[BiometricsV2] Fix fingerprint add another fail
...
Fix enrolling can't finished because FingerprintEnrollment attaches to
wrong ViewModel during onCreate() with non-null savedInstance after
rotation.
Read latest fragment through findFragmentById to fix it
Bug: 275513362
Test: atest FingerprintEnrollmentActivityTest
Change-Id: Icb2c0edec325a813ec5a7822aba39ca201d2d8e9
2023-04-19 17:35:33 +08:00
Bill Yi
9a1fd05459
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours am: 2c5359dd0b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696131
Change-Id: I08b025094e707efb65c47de4869b0e8e34e0f459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:06:29 +00:00
Bill Yi
2c5359dd0b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696131
Change-Id: I96be7c465959b1301eb2ca154f8cc93369685d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:25:57 +00:00
YK Hung
0a8bd0698e
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I9fd2dbec190fab48bc9a62ff8f1ac8a8b32437d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:19:43 +00:00
YK Hung
3f9363aaff
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev
2023-04-19 07:40:45 +00:00
ykhung
ab07b53ea1
Fix banner tip buttons visibility and update incompatible tip
...
Fix the battery settings banner tip buttons visibility not reset issue
and update the incompatible charging tip into the colored primary button
Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Change-Id: I9b72fccc7838d974d3b60d0f9684780841623cbb
2023-04-19 06:24:51 +00:00
Zoey Chen
84a7e78630
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: Ia71fe1086c3cff95a909507770409d84dedcd024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:47:06 +00:00
Bill Yi
956f1001fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: Ie81f5599817d22524385f696547f38d7aac1f636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:40:39 +00:00
Bill Yi
f99e320351
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: I57243eb7e8a721413556490dfbeb8c1e5d195aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:40:30 +00:00
Bill Yi
e8971c92c5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: Ie25abe3450df2ef4755b4541aa9b26bd070b576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:40:22 +00:00
Bill Yi
825c3da34d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I9b1147149ac65845a75dcb4da5aa6ee2588a4e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:39:57 +00:00
Bill Yi
b1a3ff1600
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I6860552138d10e6f692a4731e7f4cf1de17c1eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:39:37 +00:00
Bill Yi
4cd3e99f74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I920208c679fdc692aa73d6b0df6210b113d95c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:39:21 +00:00
Zoey Chen
5614c1e7dc
Merge "[Settings] Remove the large space when searching language" into udc-dev
2023-04-19 05:19:56 +00:00
Bill Yi
16148bb1bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00