Bill Yi
0454963189
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: If828bf934921d6b90131b67429447d33cf835d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:10 +00:00
Bill Yi
4a3e4af52b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: Ia593045d0cad75dc5d9374305b9ba44f5970e21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:02 +00:00
TreeHugger Robot
e582a12055
Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: Icae2e778c95c44dbfdfb9447f4fbf0a5ffe51b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:30:48 +00:00
Bill Yi
2e2e5de0d0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I3e53e686020443f7c955fad0377f33c4f1866a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:30:45 +00:00
Bill Yi
cb32361f41
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I253e6e404e8fe1d96da1b0bad157d9df3e19dc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:30:36 +00:00
TreeHugger Robot
074ee502db
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-08 06:15:46 +00:00
TreeHugger Robot
4b5e98636d
Merge changes from topic "tc_change_22080720_11" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
Import translations. DO NOT MERGE ANYWHERE
2022-08-08 06:15:46 +00:00
TreeHugger Robot
8089ee68b7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-08 06:14:23 +00:00
Milton Wu
84b39c3ed0
Use setting as base activity for fingerprint
...
Change to use FingerprintSetting as base activity when use launch
"Fingerprint Unlock" from Settings -> Security. And then we can prevent
that necesssary pop-up activites become full-screen.
Bug: 232874879
Test: manual test following cases on fp-only devices, and enable don't
keep activity and test them again.
1. fp enrollment on SUW
2. fp add another on SUW
3. add first fp on Security Settings
4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest
Test: robo test for SetupFingerprintEnrollFindSensorTest
SetupFingerprintEnrollFinishTest
FingerprintEnrollFindSensorTest FingerprintEnrollEnrollingTest
Change-Id: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
2022-08-08 03:59:03 +00:00
Bill Yi
1ba92844ff
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 935231bb97
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549231
Change-Id: I52eb80fb34d165afb7f17d3ef336bb93198aa4fb
2022-08-08 03:50:33 +00:00
Bill Yi
b53a13a2e0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I81b0193030cd411cfb96bac41035f1108eb8d711
2022-08-08 03:46:23 +00:00
Bill Yi
09659e52e5
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I60ece2eb12a9bffe10f577c34e98eb2e3dab95ce
2022-08-08 03:46:19 +00:00
Kuan Wang
373390f660
Update usage data for EBS app usage list and App usage detail from 24
...
hours to last full charge.
Bug: 236101687
Test: manual + make RunSettingsRoboTests
Change-Id: I48097dcaaf7b4100fbd7802940aac7c5ef92ee0b
2022-08-08 03:29:12 +00:00
Bill Yi
9c5c7b4782
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5a6b2deed1af095127bd18ecd417a06f9c01737
2022-08-07 16:26:03 -07:00
Bill Yi
6d678cf1fc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I22899566bb05f30cfa2e9bf8bbc51f23a6e7c8ae
2022-08-07 16:22:32 -07:00
Bill Yi
f018579680
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic331399e2cd77e79241be5f8c894564ce5013f34
2022-08-07 16:19:51 -07:00
Bill Yi
28e5ac6564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I547cb6a91451ece2aff22ceadc9c156cf043582c
2022-08-07 16:16:19 -07:00
Bill Yi
7aee397d84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2bee4360c5ce826ccbebfea10137b32c2598bb8a
2022-08-07 00:10:06 -07:00
Bill Yi
9f5b4abadd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9aa41389d98d2ce7358c3814faba6aa0849ad1e
2022-08-07 00:05:49 -07:00
Bill Yi
f52497bd40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f0b461048e49766d3810c8b40962610084d47ad
2022-08-07 00:01:02 -07:00
Bill Yi
c764b4ac4f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4fff28727c9bc27e16288c71ca3a8cb85f85e1b
2022-08-06 23:56:46 -07:00
Bill Yi
c5eb7f3fa4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9610ada08254acfda511aecab450b59a622ffa5d
2022-08-06 23:54:57 -07:00
Bill Yi
272619ebfc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92ca6c87d1e88a3c3306934df34891cc0af31813
2022-08-06 23:53:07 -07:00
Bill Yi
0476afd502
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I033876f448bc48999e8f23ecd84878e4579af8bd
2022-08-06 23:49:57 -07:00
Bill Yi
935231bb97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib47d9c013d2a1623f79b1438331154bdb25fc56b
2022-08-06 23:45:43 -07:00
Bill Yi
66479d6de4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 58ee9e7782
-s ours am: dc05292ad9
-s ours am: 6adfef40e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Id868b6d44f5e32c0d60482ef49bd84980751328f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 06:38:29 +00:00
Bill Yi
6adfef40e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 58ee9e7782
-s ours am: dc05292ad9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I07efad6dd904510cee4bed647cc6ad2fb103c9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 06:20:04 +00:00
Bill Yi
4e4782d09d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 854e4b5ebc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I45353c1ac21516d87ea9b3362f11bea52056245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 06:09:59 +00:00
Bill Yi
be7f4620b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours am: 30ced1fe68
-s ours am: 5b7f5c447a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Iabcc46797a574548c42fd0841d8e57b56256a9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:56:41 +00:00
Automerger Merge Worker
7cbf42158c
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours am: ff8249a4cd
-s ours" into tm-qpr-dev-plus-aosp am: 5648d42231
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: If158a99c7ed551bb3fe14f4e110ab85ccbb7a33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:54:51 +00:00
Bill Yi
d36dcaaea3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours am: ff8249a4cd
-s ours am: 58088dba53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I231d367ccba8bb074d0afa08f6d49dec599b6091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:54:34 +00:00
Bill Yi
dc05292ad9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 58ee9e7782
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I9f0b5ece1fe7bb519e2570a41cb52905a7e8235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:51:40 +00:00
TreeHugger Robot
f3ca5abffc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: c8aed9b0ec
-s ours am: bf974aec62
-s ours am: ace775c042
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Ibaf5f325afd8d56295d1b0a65cf43b596e7c690d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:50:58 +00:00
Bill Yi
a6ff2c8c96
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: bc5efdee59
-s ours am: 64332a36df
-s ours am: 2b1152f9de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Ie49e0af1bc0b20f37854aa67e421eb66d5f8a132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:50:56 +00:00
Bill Yi
4e0080cf18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: fdf95d710f
-s ours am: 94ca1b0629
-s ours am: 11d8b0fa9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I86f7fac888cdf2318949106a33421da88026a752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:50:52 +00:00
Bill Yi
5b7f5c447a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours am: 30ced1fe68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Icfeaefe8ed995e30e563ab191c216eb0ad9c13fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:43:07 +00:00
Automerger Merge Worker
5648d42231
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours am: ff8249a4cd
-s ours" into tm-qpr-dev-plus-aosp
2022-08-07 05:43:02 +00:00
Bill Yi
854e4b5ebc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I2cf759a22c20dcbe6701d600457dbd375bdd6b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:42 +00:00
TreeHugger Robot
ace775c042
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: c8aed9b0ec
-s ours am: bf974aec62
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I02fa624674e3569a9621f94793c479ebf69f6fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:21 +00:00
Bill Yi
2b1152f9de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: bc5efdee59
-s ours am: 64332a36df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I012ad8fa06ff0afef9004d019596293e11de4436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:20 +00:00
Bill Yi
11d8b0fa9e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: fdf95d710f
-s ours am: 94ca1b0629
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I84badcc8b2d828e134a6340fc89a5431912fc6cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:19 +00:00
Bill Yi
58088dba53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours am: ff8249a4cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Ia3fa59a8f865ac16c6f1fa358d6b2e6d36437608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:14 +00:00
Bill Yi
58ee9e7782
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I05c596130b9218456cd091575a324330337fa8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:02 +00:00
TreeHugger Robot
2f5d56763d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: 3dd47490aa
-s ours am: 75acc4af17
-s ours am: b6268268ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I67ee6b44239ace254e169778bf5ad3e29af6f86e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:37:14 +00:00
Bill Yi
6acb5acc0c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: f4ef7ae208
-s ours am: d450e06355
-s ours am: ac420a938f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I193a24f8aedd10d753fe28175a0e44a1ddb19a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:37:13 +00:00
Bill Yi
64d44fdc9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: 970d5d8599
-s ours am: f51ecf6636
-s ours am: 437191e9c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I99586ccae608107eafc77df5797ad06c08a0be27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:37:12 +00:00
Bill Yi
628b5833a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d03b14bd2
-s ours am: 6e7cf8ef64
-s ours am: c77ec8fd60
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526352
Change-Id: Id0af92132fc333400fa4319e79a990c27df63d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:36:25 +00:00
TreeHugger Robot
058719105e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: 3dd47490aa
-s ours am: 92b422dce0
-s ours am: aa191041b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I2a51661d0990166ce6b0c7df138b24d46758262a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:35:41 +00:00
Bill Yi
2090011161
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: f4ef7ae208
-s ours am: dfdd2f8642
-s ours am: ee1c9aa8e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I39596a8f90d4f2d53db239b66f72fbf65854ea01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:35:34 +00:00
Bill Yi
fa31af9d3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: 970d5d8599
-s ours am: e5c3bd9115
-s ours am: 662821c3e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I3521a25e848dcb26882f90c8d455ee63d57d606b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:35:32 +00:00