PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,815 Commits 1 Branch 0 Tags
c99c64d1cc0abb3fddcad3b4f7f71ea173a6b6f0
Commit Graph

124815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Mayer
c99c64d1cc Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: cfe9a7ce26 am: ff9e083367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I16980d9996454979736f71b69df00298123070b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:50:12 +00:00
Florian Mayer
8a56f78e2b Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 am: 3b97ebd313 am: 44b5faab72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I0e67699e53f8cce5d04d0a9d7d3092ea95130a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:50:03 +00:00
Florian Mayer
c0a7698d9c Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: 6fe9a4850b am: 95aa157989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ie9acf7a368f621532502b6f5e7bf877a2d7c9003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:48:55 +00:00
Florian Mayer
ff9e083367 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: cfe9a7ce26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I9d452b2c40e1e5e5e37cf4908a51431792d9ec37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:28:21 +00:00
Florian Mayer
44b5faab72 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 am: 3b97ebd313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I5672a9d6189c2704dcdedecdc724cda6cd57f8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:19:44 +00:00
Florian Mayer
95aa157989 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: 6fe9a4850b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Id5402eefa342e946abfd754ed004581b4fae303c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:18:55 +00:00
Florian Mayer
3b97ebd313 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ibe979ce519a989a6121adf21a8723f712539c504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:46:25 +00:00
Florian Mayer
cfe9a7ce26 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ibb342dd0c0da8b2a6381d89a6848cda76db482e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:45:55 +00:00
Florian Mayer
d8526d4c9c Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: b112a868a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Iaed6b8d9d579e2bb5f96bdb427ed3779933dd731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:41:54 +00:00
Florian Mayer
6fe9a4850b Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7bb16d6032f3904dba39ed87fccde24c1cadeec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:41:53 +00:00
Florian Mayer
6dd4f9a4ec Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7d000eba56ef08dfbe53fb3417b00dc5d7bdd3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:03:01 +00:00
Florian Mayer
b112a868a8 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ie6a7093cbfd8e71f63d448cfa4927eb189b5ff29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:03:00 +00:00
Florian Mayer
3be6f32c42 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ia7cef08103ad0faaedbcb26051757d3ef93b4e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 10:58:56 +00:00
Florian Mayer
d7bbff0041 Merge "Fix typo in MemtagHelper" into udc-dev 2023-05-01 10:26:47 +00:00
Florian Mayer
411d78c06c Fix typo in MemtagHelper 
Bug: 280034968
Change-Id: I5977925399342cd79f0bed2dd4af0e21c0c20102
 2023-05-01 10:25:04 +00:00
Bill Yi
1eb34e3490 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 9df29c16f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfdaa220c04611f02d61fb1074d4b7e0a6d951f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 06:25:34 +00:00
Bill Yi
9df29c16f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-01 05:44:24 +00:00
Bill Yi
d1c260b181 Merge changes from topic "tc_change_23042818_u_20" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ce6a33514
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-01 05:44:24 +00:00
ykhung
2095c5c5e9 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f am: 471bc178e5 am: 36a22e4250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: Id208af45865532b61c1dafa043997e629bb605e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 10:33:46 +00:00
ykhung
00167bdab2 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 3684f9770e am: f193d7bde7 am: 6dd32fc6bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: If86f4f7e1c549a214be1416b7aa2594e3a8b5cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 10:32:53 +00:00
ykhung
fab0f85a76 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f am: 22bfa101c5 am: 4ca62fa226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I4f5e0c38fcbd0a8660295d6748ad9b93243886a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 10:31:29 +00:00
ykhung
36a22e4250 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f am: 471bc178e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: Ifccdcb116ae9caea1bc9ba39253383ffd34b348a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:46:08 +00:00
ykhung
6dd32fc6bc Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 3684f9770e am: f193d7bde7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I91faef2689ee2980e8bd5e9d1660ea2fa42f0e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:42:05 +00:00
ykhung
4ca62fa226 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f am: 22bfa101c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I84930ab00682fcb0fa690167e1784b632851d619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:40:50 +00:00
ykhung
471bc178e5 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I0f11401a21c9d9de656d46f298b86f2779b9115a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:04:18 +00:00
ykhung
f193d7bde7 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 3684f9770e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I60bb7184eb58e5604f4d38904345ddad9b6cbbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:03:36 +00:00
ykhung
22bfa101c5 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I82f634709288f4832bac0623bc5f08ca0ecfa3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:59:37 +00:00
ykhung
1d1acc5457 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: b01092ed78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: If13eb3979f4fbc14cbfcf0736530f8f14b74876a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:59:04 +00:00
ykhung
343284fe3f Fix legacy failed tests to avoid block presubmit am: a0f3f421dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I9a28921a13578106840c73fbd21bcff23855ac21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:18:06 +00:00
ykhung
b01092ed78 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: Ib0b7fb19655ce33a791c768b3e4281ba74c38abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:18:05 +00:00
ykhung
3684f9770e Fix legacy failed tests to avoid block presubmit am: a0f3f421dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I217958f3629dd99d09b6d1a9796ceebada84dce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:13:57 +00:00
Treehugger Robot
2b2ed7d817 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 955689078f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1374cc711cd3e924eb9f58b41fa8837175d38c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 04:02:18 +00:00
Treehugger Robot
955689078f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-04-30 03:30:39 +00:00
Treehugger Robot
4e54b15f18 Merge changes from topic "tc_change_23042818_u_18" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aa051e78aa
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-30 03:30:39 +00:00
ykhung
a0f3f421dd Fix legacy failed tests to avoid block presubmit 
Root cause: the `Robolectric.setupActivity(Activity.class)` is removed from the system, which will always return the null `Context`

Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Ib52bc715508332bcb4bdcac56ecc414aa43f1419
 2023-04-30 00:33:57 +00:00
Bill Yi
71f6cf26f5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-29 13:55:57 +00:00
Bill Yi
5c03ac7c61 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-29 13:55:57 +00:00
Bill Yi
55f17c7730 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-29 13:55:57 +00:00
Treehugger Robot
beeda147f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours am: 3740b67371 -s ours am: 562c5cff1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id96b84f978a4032fc9d61773c0b94af0499cb338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:22:32 +00:00
Bill Yi
4d98a289a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours am: c02b50c037 -s ours am: c3793c571e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f75b66dbd95a2dd23498b6593da04cd3b15dbf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:22:29 +00:00
Treehugger Robot
f0ea618339 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours am: 052b29430c -s ours am: ddc3532d2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If73ed3c0d5b2fb6ff0a2ca3f2b6f40c18b2b1fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:21:49 +00:00
Bill Yi
c6927848da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours am: 243f587fd9 -s ours am: 15d433b366 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d475861489a719b654731662a5ad891a81bf4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:21:39 +00:00
Treehugger Robot
15b8fea61c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours am: e00549cdd4 -s ours am: c9eadba8d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dba92ea25ae4a3bb74e4d5206f098fba4b133c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:21:22 +00:00
Bill Yi
20dcd7f12d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: e08678a3fa -s ours am: 19fe0a3694 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7444b44c7cc84437f2245608d71aefee96c5c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:20:59 +00:00
Treehugger Robot
a1a5ae19b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours am: e6b237fffe -s ours am: 985e90888c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I883dd7ab3b792bbce62050cb21f0377e8981d472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:18:23 +00:00
Bill Yi
ce2403c59b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours am: f7324a1365 -s ours am: 4be32233a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia973fc39b3ae315d1822acee005dfaf2850b8add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:18:19 +00:00
Treehugger Robot
1a7a0bcb83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours am: 295768313b -s ours am: e1f02bcd5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26a5bbb1e02134293cf066f1159bcfa926a9a177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:18:18 +00:00
Bill Yi
a3e07855c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours am: ace4cd9f14 -s ours am: 5beef0317f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I285ca0d7dd7720a9cd71c3ec49ae0b5931bb2f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:18:15 +00:00
Treehugger Robot
329822dfea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours am: 06daae87ea -s ours am: 95d104eb24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8070d63e38c900859dab46fb0b05725c05520e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:17:42 +00:00
Bill Yi
97ad2751a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: 75f8c5d4ef -s ours am: 9a7737a274 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic60b2a84156bd312e7eeb91f6dddff6bbc1088a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 10:17:20 +00:00