Xiaozhen Lin
|
ef815e438b
|
Merge "Destroy activity in onStop()" into udc-dev am: d913003d55 am: 2e070346c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076
Change-Id: I15203fd935152eaeab4416e02cf525ec65cb0a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 21:28:51 +00:00 |
|
Xiaozhen Lin
|
60e1a88005
|
Merge "Destroy activity in onStop()" into udc-dev am: d913003d55 am: 88ed2d9a06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076
Change-Id: I39dcaaf463ae1def7131230184b4ccf7224bdd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 21:26:33 +00:00 |
|
Treehugger Robot
|
9953e7b60b
|
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80 am: 4abad22b60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703
Change-Id: I0bb05958d8ddc954532f2fcb8a2096777680f36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 21:14:25 +00:00 |
|
Treehugger Robot
|
b09b6eb551
|
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80 am: cdda0b8658
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703
Change-Id: I0c26bb3a47410bb60981c99c1aec39d0d4a405cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 21:13:47 +00:00 |
|
Xiaozhen Lin
|
2e070346c7
|
Merge "Destroy activity in onStop()" into udc-dev am: d913003d55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076
Change-Id: I110bfedf36fc45f838d2eb8ec416187f53b6d3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 20:50:49 +00:00 |
|
Xiaozhen Lin
|
88ed2d9a06
|
Merge "Destroy activity in onStop()" into udc-dev am: d913003d55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076
Change-Id: Id6ec9c3af6cea339a2fe7dc7cd6f3d69af10cc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 20:48:57 +00:00 |
|
Treehugger Robot
|
cdda0b8658
|
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703
Change-Id: Icd90be5787437ba28f354fd021b7218092467681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 20:48:22 +00:00 |
|
Treehugger Robot
|
4abad22b60
|
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703
Change-Id: I17b0b90258f62fa921db27d20c6db545318b2f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 20:47:26 +00:00 |
|
Xiaozhen Lin
|
d913003d55
|
Merge "Destroy activity in onStop()" into udc-dev
|
2023-04-13 20:45:15 +00:00 |
|
Bill Yi
|
4ed78b559f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours am: 45c919827a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: I0441270cf07e787fcf5aad79b033398aa9cd81b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 20:13:16 +00:00 |
|
Treehugger Robot
|
3b24bafb80
|
Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev
|
2023-04-13 20:10:49 +00:00 |
|
Bill Yi
|
45951948f5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours am: 6d22363f4f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: I8801f6bc6716129e2e57a6483b0327498a25dd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 20:10:33 +00:00 |
|
Bill Yi
|
6d22363f4f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: Idfe688d92a924ef5f1cbf57019c46dc5cb63d6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 19:46:48 +00:00 |
|
Bill Yi
|
45c919827a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: Iaccdc66545d618abed222f15c99bf4eb5a2c653f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 19:29:19 +00:00 |
|
Bill Yi
|
c81a93c898
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: I3c0c3db07c74f7b0c8c275cde1aa0c05ad33710b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 19:12:58 +00:00 |
|
Automerger Merge Worker
|
00ac6a4e58
|
Merge "Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: e7b7c8f919"
|
2023-04-13 18:55:32 +00:00 |
|
Lucas Silva
|
1196360a26
|
Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: 42f411984a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360
Change-Id: I01d239417080c6bb4c983ba2c9641f8d68fe5706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:52:03 +00:00 |
|
Lucas Silva
|
2cc3078e8b
|
Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: e7b7c8f919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360
Change-Id: I562926d178074206240882885992777b7105ff03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:50:44 +00:00 |
|
Lucas Silva
|
42f411984a
|
Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360
Change-Id: I484b4b3d5a7945b5384d022d410d0c9ee311184c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:38:21 +00:00 |
|
Lucas Silva
|
e7b7c8f919
|
Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360
Change-Id: Ibbd51e1338a7f8f404a5bb125b968e59a70d1e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:35:37 +00:00 |
|
Bill Yi
|
68cef2d659
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours am: 7c238ffd29 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: I09782da7b5e425ba1d752afbf5c75cde854f0698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:35:27 +00:00 |
|
Bill Yi
|
4cd8cc1353
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours am: 93c4a0ac79 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: Ib52408652bb15928322b1080f8f1d1371a32c797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:35:16 +00:00 |
|
Bill Yi
|
1decbc3872
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours am: febd455984 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: I5ea4a7b45591c01cd02cd358562c0e5201641a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:35:01 +00:00 |
|
Bill Yi
|
cfc9d019d8
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours am: ec96f6abcd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Ic27939c517b85c017e94c0e5d5cd5bce4db4788b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:34:39 +00:00 |
|
Bill Yi
|
7d2110bd60
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours am: f5782293d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I869a4ca96467b64ae02b1f211496688fcc73774c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:34:14 +00:00 |
|
Bill Yi
|
e9d6836259
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours am: ea747f6325 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I1ccaddc93017e6520154c0afa0c1eae8bb8cf094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:33:56 +00:00 |
|
Bill Yi
|
938a981ff6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567295
Change-Id: I08a06bda42f5180f702b93e5285c374d03606cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:33:28 +00:00 |
|
Lucas Silva
|
07d056f5c6
|
Merge "Add intent for entering communal settings" into udc-dev
|
2023-04-13 18:28:43 +00:00 |
|
Bill Yi
|
abb5acb64e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours am: 2e834a8f88 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: Ia8033beeeacb141a74a0abd88fa6c5d6a16de2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:19:31 +00:00 |
|
Bill Yi
|
6da36b9a3c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours am: 6783da78de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: I33a4904f028430d5379ad1b748d6bd6762c468c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:19:29 +00:00 |
|
Bill Yi
|
31524bfa5d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours am: 154e826ae6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: I191fa43141453f3b97849cec8866042f7238b6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:19:27 +00:00 |
|
Bill Yi
|
0fe80ba5df
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours am: 23cddc9689 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: I8e6189a38cc6abb6e787c74012189fa76bf949f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:19:25 +00:00 |
|
Bill Yi
|
179a70774e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours am: f6e56e7ad3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: Iae2f571dbe7e670909401af72a6d2000fdd1af9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:19:23 +00:00 |
|
Bill Yi
|
d6df69fbad
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours am: a60ca8c201 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I9a33c149147154f85a8a36dc240569ec6341ceae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:17:36 +00:00 |
|
Bill Yi
|
2e834a8f88
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: I512b398134c74e19705ddeeaed1f4f8709a7206a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:09:15 +00:00 |
|
Bill Yi
|
6783da78de
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: Iefc6632a3603279a0bcef3af6409d58ee9972f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:09:11 +00:00 |
|
Bill Yi
|
154e826ae6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: I9f7a39e56745b0e1bb6ca44dad6ff56067772355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:09:08 +00:00 |
|
Bill Yi
|
23cddc9689
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Ibf8617bcada40ca4924dd6f6b7cc19f3d647703c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:08:52 +00:00 |
|
Bill Yi
|
f6e56e7ad3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I4ff77937dabcca782b6c8a54138a0c742f868f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:08:34 +00:00 |
|
Bill Yi
|
a60ca8c201
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: Ifa75a86c9366e359911775d92df45a1c8b75832e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 18:08:13 +00:00 |
|
Bill Yi
|
7c238ffd29
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: I9a9687a44ad201177c7a8c417b6633184a1feb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:54:10 +00:00 |
|
Bill Yi
|
93c4a0ac79
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567636
Change-Id: Iec8c9647f0d155ea0852c69fa41f53edbdd440c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:53:56 +00:00 |
|
Bill Yi
|
febd455984
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Id684625868f207b26025f16125454d641d7c8e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:53:45 +00:00 |
|
Bill Yi
|
ec96f6abcd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567294
Change-Id: Ib2660e00fae9cd35e6c5a9f84a4cc8efc9d33f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:53:27 +00:00 |
|
Bill Yi
|
f5782293d1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: I8e2e8305a86e9f5c59062b6d7f39e169e5548d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:53:04 +00:00 |
|
Bill Yi
|
ea747f6325
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567293
Change-Id: If7c8d182ec0ecb39ffc9b725d91c98ed157cbc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:52:41 +00:00 |
|
Automerger Merge Worker
|
0ac6ec2601
|
Merge "Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110 am: 672cb31782"
|
2023-04-13 17:32:52 +00:00 |
|
Tetiana Meronyk
|
80be0dc53d
|
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110 am: 6b07394a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: I821505074afa6fdbc74867870782a5cfb8808774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:31:43 +00:00 |
|
Tetiana Meronyk
|
5815ceeb77
|
Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110 am: 672cb31782
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660
Change-Id: I21281217ae83b5b9cabe05744befe260081832a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-13 17:31:06 +00:00 |
|
Xiaozhen Lin
|
7a89f15fed
|
Destroy activity in onStop()
Pixel Imprint will call onDestroy() whenever its menu is invisible.
(https://source.corp.google.com/tm-dev/packages/apps/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java;l=547?sq=package:tm-dev)
However, Screen lock should have the same behavior as Pixel Imprint but
it doesn't.
onDestroy() for Screen lock should be called whenever we exit the menu
or the menu becomes invisible. Otherwise, the password may be leaked to
RAM unexpectedly in some situations.
Bug: 233373529
Test: manual
Change-Id: Idc0c115fc2061d863f9cab2aed99c04340b827f8
|
2023-04-13 17:29:48 +00:00 |
|