PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,003 Commits 1 Branch 0 Tags
d45c617b2d122703f232d562f36495b3970df4f9
Commit Graph

123003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
d45c617b2d Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872b3 am: 581f3e8286 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414532

Change-Id: I8b3205e91381b33782a041414dbcb79042951a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 14:21:43 +00:00
Zaiyue Xue
581f3e8286 Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414532

Change-Id: I6cb6b20bce20f7758d200a6260975b8dfe62cbb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 13:54:06 +00:00
Zaiyue Xue
fbe85872b3 Merge "Refactor function to support slot size not must be two." into udc-dev 2023-04-07 13:09:11 +00:00
Zaiyue Xue
06b8092fdb Refactor function to support slot size not must be two. 
The function insertHourlyUsageDiffDataPerSlot() only supports the slot
has two-hour data now. This assumption is not neccessary. Refactor this
so in my next cl ag/22379150, the last-full-charge slot and now slot
could have only one-hour data.

Bug: 271214926
Test: manual
Change-Id: I57f7898ce1c92b8849baf9a44314455adf0098f4
 2023-04-07 19:49:52 +08:00
Jason Chiu
f638bfedb6 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours am: d21043eb92 -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: I312e5e9bd25c66357895bdce7f19b255a0757ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:56:31 +00:00
Jason Chiu
807bd8c158 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours am: 7fdfc9e519 -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: I0a961afc1c3161d104c9e4ec2d978ddd1c053f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:56:22 +00:00
Jason Chiu
d21043eb92 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: Ib585307dd26cab267240c892458314a54943b3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:26:09 +00:00
Jason Chiu
7fdfc9e519 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: Ie82241400edc90957a797425c1a4efaec05cb560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:25:58 +00:00
Jason Chiu
c239942dee [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: I17774688cd6ca04a30541be3d65aa099dfd5d5b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 06:54:14 +00:00
Jason Chiu
1bd4b6e2ea [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: I5669aefc0320ecdc610c56e0aade5600b5a1c79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 06:26:10 +00:00
Automerger Merge Worker
9d242aa008 Merge "[automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours am: f98cfff495 -s ours am: 37ae274714 -s ours" 2023-04-06 20:01:46 +00:00
Jason Chiu
9ba0a19ccc [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours am: f98cfff495 -s ours am: c3a4d10115 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: Idfd1bc5ed777cea49de62e90dcee5dc3355f092d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 20:00:05 +00:00
Jason Chiu
20a091bd01 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours am: f98cfff495 -s ours am: 37ae274714 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I34ccb0033c5ce90bcb22e356184dd1592102a5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:59:52 +00:00
Jason Chiu
37ae274714 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours am: f98cfff495 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I7e79c204ff00ace62d256a717f01f402753ff89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:31:48 +00:00
Jason Chiu
c3a4d10115 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours am: f98cfff495 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I17312ce979ea3a60bc4c1481e78ad8e3bc9c3116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:31:43 +00:00
Jason Chiu
f98cfff495 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I08568549208788f413eeca7cda8214862f986da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:59:53 +00:00
Jason Chiu
e5fa405609 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I4bafcdad13776f705b0a80380a06249bd88a424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:27:25 +00:00
Jason Chiu
f133736e6c [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:00:33 +00:00
Becca Hughes
b3881733e6 Update string to match new mock 
Bug: 274123541
Change-Id: I7735b6fd3fe51b85e1a18da0a2ba484bae942f9c
Test: make
 2023-04-06 17:17:37 +00:00
Darrell Shi
add666d0cd Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 am: 9c42bf89fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22391043

Change-Id: I2663b0fb3f9d32250f6d8d75a64cf6f1c6cb6645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 16:16:19 +00:00
Darrell Shi
ed05a003f2 Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 am: b3b0ec6811 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22391043

Change-Id: Ic87f0a316ddf494b6b470153b5ba7dba5c52d4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 16:16:00 +00:00
Darrell Shi
b3b0ec6811 Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22391043

Change-Id: If605fec99324b08bda168186285e9c33bd92cb86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:51:35 +00:00
Darrell Shi
9c42bf89fa Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22391043

Change-Id: I314b62d3617787495f1aef4c168afd40b68816f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:51:21 +00:00
Darrell Shi
7242e7bb86 Merge "Hide timeout to user0 pref when switching blocked." into udc-dev 2023-04-06 15:22:25 +00:00
Automerger Merge Worker
5feb03d1fb Merge changes from topic "am-35ba34b55c0141f9a02132b563af0c28" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours am: e0ac8c3aea -s ours am: 44f5246022 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours am: f0a5a877f0 -s ours am: 03954aa591 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours am: 7c2ebdf095 -s ours am: 0f4054f1ef -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours am: 21e2a17443 -s ours am: 4579cbd02e -s ours
 2023-04-06 15:16:39 +00:00
Bill Yi
b30e7c39a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours am: e0ac8c3aea -s ours am: 44f5246022 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62ad744ad573217e93dd16c5983793cc41ef0af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:15:37 +00:00
Bill Yi
1d35c76100 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours am: f0a5a877f0 -s ours am: 03954aa591 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb0721c69ff68edef4ec0849d06892e8be468dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:15:23 +00:00
Bill Yi
f2b68a12a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours am: 7c2ebdf095 -s ours am: 0f4054f1ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I139c0b79dcdf4b2dfa829f091d4a86c448c48d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:15:07 +00:00
Bill Yi
b76e5aa264 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours am: e0ac8c3aea -s ours am: a40a0b2be9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib766bc25e904bcf750794297a7f5a4e549bd948e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:15:06 +00:00
Bill Yi
ef4322432c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours am: 21e2a17443 -s ours am: 4579cbd02e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f0fd9c4857be135b4c9ef72b8b7d79a3320f62e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:14:54 +00:00
Bill Yi
37396cad04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours am: f0a5a877f0 -s ours am: 9065c1f306 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54f960f90cde4367b177c0e14c72dc75df15d0ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:14:52 +00:00
Bill Yi
6b4f095256 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours am: 7c2ebdf095 -s ours am: c6aadfbd61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c8fac48ce60b6afb3c0fe69a8e6b6eaad7284c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:14:36 +00:00
Bill Yi
adbebd7af4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours am: 21e2a17443 -s ours am: 4fa89a904e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieabfff9d13da1bd3ceee93ac9cba077680f85f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:14:24 +00:00
Automerger Merge Worker
2d04c1bf5b Merge "Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e am: 1863ec03b6 am: b66e96ad2b" 2023-04-06 15:07:09 +00:00
TreeHugger Robot
6274de6742 Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e am: 1863ec03b6 am: f5bc5d2968 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: I1ddc89694d218503b4b999e961d83d7f7da3b1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:04:12 +00:00
TreeHugger Robot
7d7ac7f035 Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e am: 1863ec03b6 am: b66e96ad2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: I099c2c028ed98f11daf6b91700c374ec59af305f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:04:08 +00:00
Bill Yi
a40a0b2be9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours am: e0ac8c3aea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1963ef9bc3f338b8ea0fc92943dd80b1e0b70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:56:13 +00:00
Bill Yi
9065c1f306 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours am: f0a5a877f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50c71e800ba65288a1d687b7581ee9c922b302e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:56:07 +00:00
Bill Yi
c6aadfbd61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours am: 7c2ebdf095 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6acaf0ff713a578e6df6388783e172b5232bb893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:56 +00:00
Bill Yi
44f5246022 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours am: e0ac8c3aea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7a97305565f1ed6f78a2dc6ff93676b0964f3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:46 +00:00
Bill Yi
03954aa591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours am: f0a5a877f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69edea874ce1a97753efdf6d590703306b029f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:44 +00:00
Bill Yi
0f4054f1ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours am: 7c2ebdf095 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d4505f9678f91bf69f2257058ac094d963e789b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:42 +00:00
Bill Yi
4fa89a904e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours am: 21e2a17443 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I694e7fa20f4dfd02431a026525123baa39b14a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:24 +00:00
Bill Yi
4579cbd02e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours am: 21e2a17443 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62c86bb70c470fbd877ec902ed82d7a7b2f3e014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:53:39 +00:00
TreeHugger Robot
b66e96ad2b Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e am: 1863ec03b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: I535c7b1cdab0a502d2f9f07d48076b7ac7f60711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:37:30 +00:00
TreeHugger Robot
f5bc5d2968 Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e am: 1863ec03b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: Iae495e3afd7e44cfe2d068b3532a080abd66e110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:37:05 +00:00
Bill Yi
e0ac8c3aea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63ea81451ff0241ace1c2e8954392ad5c4a7b18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:26:33 +00:00
Bill Yi
f0a5a877f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I609fb4f3846f8bd88d5bf25e6b73d257e0302083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:26:26 +00:00
Bill Yi
7c2ebdf095 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec272fb51d48ca3d75fee55f17daf02d255852bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:26:12 +00:00
Bill Yi
21e2a17443 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I982bc7a7e5e27c07bd9a60b6fee1a605bf105195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:25:53 +00:00