PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,590 Commits 1 Branch 0 Tags
d08dc7a663cb5b7e17c98df2e274b3ccf362da02
Commit Graph

126590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
d08dc7a663 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 50244c4f86 am: 804b4d6eb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

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

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

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

Change-Id: Ia5e2d91fefce7b07533e933c2abc658b8fbd510d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:58:10 +00:00
Treehugger Robot
db677df870 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46 am: 4f174a46a7 am: 132f4d3966 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I2997f420576b7916cfa711c1ac800df2d8d89f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:55:21 +00:00
Bill Yi
0e459427f3 [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: 3b873d5add -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: Ie8f53ff93a7fa4f5a73a249f1e2d632bd0e3ca05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:55:13 +00:00
Treehugger Robot
89db703d11 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 9f55b55639 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11c2ccc5fe96118e326e35adf208f2d4ccb01c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:48:28 +00:00
Bill Yi
b8ddbef086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: c4697ef5bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8023dae1133c5fa698727967f8296a4043a186ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:48:25 +00:00
Treehugger Robot
e8744354db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: d03c1b75de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If09b93be65113c1fcff613f07c706d7a0da9a17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:48:23 +00:00
Bill Yi
f81bb062ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: d4b8fb52c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab1ad00db2e98b602f8d504f4270e6552316941b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:48:06 +00:00
Treehugger Robot
55d06f519a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 57c29e30d3 -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: I5489cc8f4c7baf496d1f8ba246180afb3ac07814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:47:46 +00:00
Bill Yi
1da0fb35a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0e4e07c6e1 -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: I6adf1f1611803783f27005469ee5b568134f5b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:47:25 +00:00
Treehugger Robot
b1a9ba8a14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1c9bf31044 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie72ec3f430219d477493d0e0a1c6fa92c9829d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:38:57 +00:00
Treehugger Robot
e7ff210f26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: bb298358c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4388dc786e27db25a8152226be592a5214e008f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:37:50 +00:00
Bill Yi
daa006af76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 606f49981b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e7d212d0f3bbd6ed6d635d26448ca1a4faaa96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:37:33 +00:00
Bill Yi
7b0fe10dd5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Bill Yi
94298e638f Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Bill Yi
deaa34f3f7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Treehugger Robot
de23e4e00a Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f am: b73b014d14 am: 570fa06b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I5d29be0daff26cd69f8c5ec5a8c162779b0bc8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:17:41 +00:00
Bill Yi
d27f3ed580 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours am: ac2dc0940e -s ours am: 906fb93516 -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: Ic4478eccf39285f8d9756c5f3b291b2d617d9ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 23:17:32 +00:00
Treehugger Robot
8a36c107a9 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 5e8e9ace78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

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

Change-Id: I8eb5c88cdfe891a791c8d7db62059060b225f757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:17:04 +00:00
Treehugger Robot
39d7631b15 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 90d6926883 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I82e79710f33f6d0fc4df8cd258931a1a5c773133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:15:36 +00:00
Bill Yi
474edb9090 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: 3464a64172 -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: Idbcc8f7b3a92560ba658b1f899b2fded636ac31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:15:28 +00:00
Treehugger Robot
9f55b55639 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica5d5437cdc99dace7ca00e1c0828783b12ae335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:48 +00:00
Bill Yi
c4697ef5bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0eeef0f8e19e8fbc74eb49b7ea766aca3c947c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:44 +00:00
Treehugger Robot
d03c1b75de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d0475fa3f2256ba3ff5957f9e07c1abd7188ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:41 +00:00
Bill Yi
d4b8fb52c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8793f182238e5a9cf2df28964c2e07bff69569e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:22 +00:00
Treehugger Robot
57c29e30d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -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: Ie39284a9d4ef0776f0d67133ed95379c11e97636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:14:02 +00:00
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
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
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