Commit Graph

126622 Commits

Author SHA1 Message Date
Bill Yi
0e4e07c6e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d1807ac6f91b48070e4be8225de3961b64774be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:13:44 +00:00
Treehugger Robot
07a4951e7a Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 4dac429af9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I6c24489c28987b49b8f9037fe6dfeaedfd18ce0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:12:41 +00:00
Treehugger Robot
804b4d6eb6 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 50244c4f86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I0f99f2703b5411f6fe4405b517cc43c20562753a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:11:23 +00:00
Treehugger Robot
e2a9d31903 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e am: 5a44e6de08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I8595a7e930670b851a241ffab99008ed3887011d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:10:24 +00:00
Treehugger Robot
8a2c0e7eb5 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 84adeeac02 am: 22ecaf7c85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: If6a9ebd115b4f5c897799dcc58b74b02cf0e1826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:08:41 +00:00
Treehugger Robot
d5a20542ba Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 02aba89873
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: Idf293ca7270452e0906f92f9fd0e8f5b044c83bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:07:57 +00:00
Treehugger Robot
1c9bf31044 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-10 21:57:58 +00:00
Treehugger Robot
4b9a97b9b0 Merge changes from topic "tc_change_2305100725_91"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b6efea437a
  Import translations. DO NOT MERGE ANYWHERE
2023-05-10 21:57:58 +00:00
Treehugger Robot
bb298358c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-10 21:57:36 +00:00
Treehugger Robot
767a923ecd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:15 +00:00
Treehugger Robot
d28f600d0e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:15 +00:00
Treehugger Robot
3b7b23acb8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:15 +00:00
Treehugger Robot
57efff9e30 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-10 21:52:58 +00:00
Treehugger Robot
514fef7723 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-10 21:52:58 +00:00
Treehugger Robot
2c7395d101 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-10 21:52:58 +00:00
Treehugger Robot
06f00fb2c6 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f am: f9d8c74ccb am: 75f0a9d40e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I26e75b66560c42380c76fad8827e6fa06142ecd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:48:34 +00:00
Bill Yi
fcc49ba61f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours am: 218406c700 -s ours am: 1475e83aad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61acea0dedb7898a8292abab155c644cba38a009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:48:24 +00:00
Treehugger Robot
45923cd309 Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: b7aa09caf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I42722c5dcccb8886f9ef33ec46c6a5c9b8aeaaec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:32:29 +00:00
TreeHugger Robot
2f3cb9356c Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 2075dbd4c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I7eca94b590e610b9892acec3b2d0cf06fb583bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:32:19 +00:00
Jigar Thakkar
65716d80d1 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: e36f5fd311
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I650765e984442bdb65c7f4b979a586970150e3e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:31:48 +00:00
Treehugger Robot
566bf5cdfd Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 0145eec48c am: c85a655793
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I5f4900d517d78e6e95a54a7bcb64805810fcee8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:58 +00:00
Treehugger Robot
c29b9c3f4d Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: 568034bd25 am: 3bd166535c am: e370dbf53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I4dedf1faa518667a4cf6ec62a850755a95a55ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:48 +00:00
Treehugger Robot
c05a1f20ae Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 13e131f352 am: 8e40694817
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I86e10f707410a1c0878a0119cc03e0e80c7489c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:37 +00:00
TreeHugger Robot
94189048de Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ca64a03ef9 am: ab8489d69e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: Ie9e7c7edb01817f6e89fb892d77fcdf01fe187c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:25 +00:00
Treehugger Robot
50244c4f86 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I1eb1f15352b7181d33acb68465a42a6d41d466dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:23 +00:00
Treehugger Robot
636204bacd Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I0b3c0cce50152004dcb452bdef680a74b2c8c2dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:20 +00:00
TreeHugger Robot
bd4f0fc2c5 Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 11a070b2ae am: dfda9f20d7 am: 3b0732aa61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I8e90a635e8a2892bfa7db50b5feb8cf9843b778b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:16 +00:00
TreeHugger Robot
80190179ba Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ed35b5e376 am: 672ef42ab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I4934e755229741218d3b8979fc8318a2b412f168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:05 +00:00
Treehugger Robot
5a44e6de08 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I6f4d03e69c29e883067157063e9413ce54da1643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:27:28 +00:00
Treehugger Robot
22ecaf7c85 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 84adeeac02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I3cf08e1ca01a551c1a0b849b05e898f1ee5fb780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:27:12 +00:00
Treehugger Robot
4dac429af9 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I256ccfd42a0e2cb6520d94bc9c0505bc57f808d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:26:48 +00:00
Treehugger Robot
02aba89873 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I811dc8fbc6aa17f7d208add12b1fcbf81d5a6668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:24:19 +00:00
Treehugger Robot
432a204870 Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed am: ef17df23e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577

Change-Id: I6991a183a8a522c859ffb49932b4468a2843e117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:04:08 +00:00
YK Hung
cdfd66f1f8 Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca am: a7c609e8a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578

Change-Id: Ibab295a2c6c7430a7dda17ac91f5d50c67b56030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:03:59 +00:00
Treehugger Robot
f912aa4bb0 Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865 am: 05f97ecd76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005

Change-Id: I7a48d2c95506fe8179d732886d187a52bbd5b7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:03:50 +00:00
YK Hung
dd07fedac7 Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235 am: 54f5d10725
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004

Change-Id: Icc0c51ba1a7aca85809b04f3010ad32b799caf0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:03:39 +00:00
Marcello Galhardo
fb5cd2d484 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 852c116fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Ia93e0e51c1d508cfa0ac40ea543f35e33b075c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:03:12 +00:00
Jigar Thakkar
db761084a1 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 5577564ed0 am: 39552c5f86 am: 654df0d806
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I158d0200a7e4769a744efde71131528e48a577de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:50:30 +00:00
Jigar Thakkar
988a5c9919 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 26ce822b48 am: dd3e47e855
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I0e9503dbae4882c02108865a27a715885c0a392d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:49:45 +00:00
Treehugger Robot
5e8e9ace78 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I3aaa0cea9d418c73f7826b0feef609cb68a38970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:47:13 +00:00
Jigar Thakkar
b6e12d7ff1 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca am: 33f1f4c479
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I196a12897085e7dd54caf5dcc3110c9b4a8a922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:46:31 +00:00
Treehugger Robot
14ffc962b8 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: Iea1841e0a8b214e6783403f511e4d3a08519a703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:45:19 +00:00
Treehugger Robot
4c6f37b1d6 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: Idbc8f808ca0031d19af3d47e6c824aa35ea29daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:44:19 +00:00
Treehugger Robot
f53c4e872d Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I154a0ea462d13c4e8733697b4288611c6bbcb972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:44:05 +00:00
Treehugger Robot
b2b823f18e Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I138b9018ed269a740362090f00e0ac525405e1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:40:21 +00:00
Treehugger Robot
84adeeac02 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: If32911653717d59046829ac9f4207669a847b244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:40:07 +00:00
Treehugger Robot
f6eab0c9de Merge changes I4c4d257e,I4cc4cc22 into udc-dev
* changes:
  Warn earlier about 5 provider limit
  Fix credman provider not showing
2023-05-10 20:00:29 +00:00
Treehugger Robot
3061bcf10a Merge "Fix change not picking up work profile" into udc-dev 2023-05-10 19:57:22 +00:00
Treehugger Robot
132f4d3966 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46 am: 4f174a46a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I7da2873931378be30dbc6baebceea3641498f80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:49:50 +00:00
Bill Yi
3b873d5add [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: 7e9b0a8bc7 -s ours am: c9ce34190e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96f9a5297c726b89fc7b6947d0f91a02621dd30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:49:39 +00:00