PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,997 Commits 1 Branch 0 Tags
12f8f5ac7adc02dd574f4f43f934caa326b1cdc5
Commit Graph

133997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinyi Mao
12f8f5ac7a Merge "Update power_anomaly_event proto fields" into main 2023-08-18 02:52:18 +00:00
Xinyi Mao
26a2056b8e Merge "Update the detect & show pipeline for PowerAnomalyEventList." into main 2023-08-18 02:52:02 +00:00
Zaiyue Xue
aa37dd953e Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 1dad0bf856 am: d1a0370ddb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211971

Change-Id: I2e0c1388e423cc18db20bbbb1f14b73d9667199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 02:47:49 +00:00
YK Hung
6b6267ecf8 [automerger skipped] Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev am: 1119c81d10 am: 1b961c35ff -s ours 
am skip reason: Merged-In I0c477dc546ec4d00e4c4133afb61bf7d574be9f8 with SHA-1 4ea5aaf5ef is already in history

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

Change-Id: I1c8aa1e62565ca8f2cb55fa706ea972a88c5e740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 02:40:41 +00:00
Zaiyue Xue
d1a0370ddb Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 1dad0bf856 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211971

Change-Id: I5b3b38a62fba34203e0195cdcc510c68f8e12652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 02:39:34 +00:00
Zaiyue Xue
1dad0bf856 Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev 2023-08-18 02:35:15 +00:00
YK Hung
1b961c35ff Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev am: 1119c81d10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24400415

Change-Id: I81f08d96e2867dd70d031bb7ee4a05756daa33ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 02:08:40 +00:00
YK Hung
1119c81d10 Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into udc-qpr-dev 2023-08-18 01:35:31 +00:00
Edgar Wang
6e5f75dfd6 Merge "Make RadioButtonPickerFragment support highlight preference" into main 2023-08-18 01:05:03 +00:00
Joshua Mccloskey
cdc91b0056 Merge "Adding owners file for biometric settings." into main 2023-08-17 22:02:18 +00:00
Joshua Mccloskey
e198ff269b Merge "Modifying FingerprintSettingsV2 structure" into main 2023-08-17 22:01:58 +00:00
Anvesh Renikindi
4f510190b3 [automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 am: 5a6d7745d0 -s ours am: e81a0072ce -s ours 
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 4ca80e6013 is already in history

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

Change-Id: Id21424350383910aa031e6fc33680303fd363762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 18:03:45 +00:00
Anvesh Renikindi
e81a0072ce [automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 am: 5a6d7745d0 -s ours 
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 4ca80e6013 is already in history

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

Change-Id: I83b30c97b8b21d6eb1d14b238088f0708d8e68a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 17:34:12 +00:00
Anvesh Renikindi
5a6d7745d0 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787

Change-Id: If307c1d7545d2528aa271a98fc8f236b0d5570bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 17:14:29 +00:00
Anvesh Renikindi
942e44c0b8 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp 2023-08-17 16:49:52 +00:00
Jeff DeCew
c575812540 Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: 745b7dca9f am: fa4994e1a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24405286

Change-Id: I8d1740726ce793bbdf3b3effcee5d1f0d523a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 16:20:09 +00:00
Jeff DeCew
fa4994e1a2 Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: 745b7dca9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24405286

Change-Id: Ia9daf2b103e562891356bf638bfa097b283add83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:50:31 +00:00
Jeff DeCew
745b7dca9f Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev 2023-08-17 15:35:28 +00:00
Vania Januar
e2108b4b5b Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev am: a928e9202f am: 728bf8b8b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446427

Change-Id: I4d2d00428e09d1f2a07f6a777328b42c146dd183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 13:29:07 +00:00
Edgar Wang
a1207d2b76 Make RadioButtonPickerFragment support highlight preference 
Bug: 296356424
Test: visual
Change-Id: If8b093dcdbf2dda910a3236f75bed4fc363cd02a
 2023-08-17 09:47:44 +00:00
Treehugger Robot
b01d241023 Merge "Gray out the "Remove account" button when there's a restriction" into main 2023-08-17 09:22:10 +00:00
Vania Januar
728bf8b8b7 Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev am: a928e9202f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446427

Change-Id: Ic6326aaf9622027f8347d643b99565165e2b3efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 08:44:37 +00:00
Jason Chiu
b6c2108c93 Gray out the "Remove account" button when there's a restriction 
Fix: 243011338
Fix: 288887119
Test: robotest, manual
Change-Id: Ie3d6607f69a5e7c66bb750febc4d526d6d209ac6
 2023-08-17 16:30:11 +08:00
Vania Januar
a928e9202f Merge "Listen to USB_STATE events in the StylusUsbFirmwareController." into udc-qpr-dev 2023-08-17 07:50:54 +00:00
mxyyiyi
2037b262ff Impl the detect & show pipeline for PowerAnomalyEventList. 
Test: make SettingsLibRoboTests
Bug: 293813663
Bug: 296322845
Change-Id: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
Merged-In: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
 2023-08-17 06:35:49 +00:00
mxyyiyi
a7a0949a35 Update the detect & show pipeline for PowerAnomalyEventList. 
Test: make SettingsLibRoboTests
Bug: 293813663
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f978f8b045c2d08e07735f0e7c2b343d53fb5580)
Change-Id: I4a5a550b8c1a2317468e8cc4bd8c2b594c4208ac
 2023-08-17 03:55:21 +00:00
Treehugger Robot
ab4ee23850 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209 am: fc02a337f8 am: 7e297c494a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: Ifda23786d9102042d4beb2ce09b4bfd24f911cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:32:50 +00:00
Treehugger Robot
1528657fce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: bc55c69e9c -s ours am: 2f6fc7155a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib38b801872c766f72b8758f36ed4440ceebb86ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:56 +00:00
Bill Yi
fcb94c583d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 3f1da62e96 -s ours am: 05b9ab239f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7a91f9e89c179005cc70d39c6bfca934e17b0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:47 +00:00
Treehugger Robot
98c11feba8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: cd8a489f80 -s ours am: 63353599ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7811a3f795c1f4e168bfda652febfb244171e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:43 +00:00
Bill Yi
002f72a2b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 34a88d2b41 -s ours am: 3d0cc12624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9026a730532b2b5cd837b58ab4eac76fa4e7f76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:30 +00:00
Bill Yi
2368f5d1eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: f249e4a70a -s ours am: d79d7df867 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff8070d5b21e007a5833640c7b2d35b8b66a848e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:18 +00:00
Treehugger Robot
fb2b65fd28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: f53e0c2d9a -s ours am: 829a488fe9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c5c5701fb5afbf954997689e84488fa2e666385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:22:10 +00:00
Bill Yi
b982016c1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: cc1b89c2a8 -s ours am: 22041ca1e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6a49496e569657245dcca471b7d4ad097f4065e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:22:08 +00:00
Treehugger Robot
096e835466 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 0ed7579d93 -s ours am: f705cb9c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5539f564d1c40b79d8c64729165fb444a5aa6348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:21:58 +00:00
Bill Yi
e4572512bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours am: adec329708 -s ours am: fe4af04f71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d11d7cfdec7c5a59767cb9df22f8302c0097ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:21:40 +00:00
Bill Yi
fa07d4622d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours am: bb47e1653c -s ours am: 4ce3453e9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie389e336f57a66d662e9ab9fe8278834696eee7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:21:28 +00:00
Treehugger Robot
995d39dcd1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: c3cd16d5b8 -s ours am: dacbb6472a -s ours am: 8c89d545a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1828c59defe27685b7af573adf472f9625d733f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:46 +00:00
Bill Yi
a78af63bfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 08e62ded38 -s ours am: c0a08d8d80 -s ours am: bb13b0f059 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15bbaab597416cabdc1f4a247b9f5e816ac5d02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:39 +00:00
Treehugger Robot
69bc8dfabb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 1b931db3c4 -s ours am: 3e97718152 -s ours am: 95878472d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5167dd5d8c44f5bd132b473588315b5ad2253eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:32 +00:00
Bill Yi
684ee4d463 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: 7046a1bc58 -s ours am: 7a2398d9c3 -s ours am: 4a90f9b832 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88805104cd231226a073aad2101ce859f717076c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:21 +00:00
Bill Yi
aa0a157d8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: dd6b25ed95 -s ours am: dceba1f16c -s ours am: 448f61d46c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1879833b7804e0f54f86ce78f5719b646acac71f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:06 +00:00
Treehugger Robot
3e5a45c53a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: df335dfd78 -s ours am: 192b3d2519 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a680141630955a7cdab947e4b24625916d7c448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:53 +00:00
Bill Yi
7a69d45717 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 0341e80c5a -s ours am: 166472f8f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfaa2f435e6b9b3ccc534b2701ff882e59234cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:50 +00:00
Treehugger Robot
0abe69b5b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: d751e40eb5 -s ours am: 95e165200c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8900783b2589e0b11c56827f7d538274c8d9937a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:43 +00:00
Bill Yi
c2bc17d81e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 5a56fb9727 -s ours am: 46ccfabc0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0402494f35154df79eb258a0331d45287bfd1eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:36 +00:00
Bill Yi
d8c680a8b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: cc4724d018 -s ours am: 6ddc9eebcf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1b3e97609324fe1d5acf200f83b66ec39eeb3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:12 +00:00
Treehugger Robot
5976affbb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: 5152042cef -s ours am: 4aa411dd4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f3814d917e3d48fe83ecdae9ebcd394c2627ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:06:42 +00:00
Bill Yi
4264a42099 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: a3c28a2091 -s ours am: 7c41697bed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bc3de1ee475b57d206be6a786e4bf2af07387bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:06:39 +00:00
Treehugger Robot
64a6ffd904 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 3838cd44da -s ours am: 08d6c6baee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic92a82c945ab285b35bbbf7d92a5f772434ab9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:06:34 +00:00