Commit Graph

93337 Commits

Author SHA1 Message Date
Bill Yi
2b1eaf9ff7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 34aff9aaca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4dda9cf94fd6d75f1cc7449faa9915883e74b0e5
2021-07-30 15:08:25 +00:00
Bill Yi
576d35ca87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 295b1bb97b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41d66fd7e328cc1dda83f253179ab7943baa355d
2021-07-30 15:07:57 +00:00
TreeHugger Robot
637f826dcf Merge "TARE string clarification" 2021-07-30 14:55:51 +00:00
Bill Yi
34aff9aaca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7bfa1ad32cabb5028a907affcaac8ea9bb7224c
2021-07-30 14:53:52 +00:00
Bill Yi
295b1bb97b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec3a965e95f539c618044b241380e9af19dc20a6
2021-07-30 14:53:05 +00:00
Bill Yi
9c72a8c5f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73033d1b8888120b77e48edd8ce23eb1beca3b7e
2021-07-30 14:52:58 +00:00
Bill Yi
b2b32da651 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 2487eee891 -s ours am: 96e13f3748 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1381596c0736d37f24e40ff977af702e9fb4f942
2021-07-30 14:48:33 +00:00
Automerger Merge Worker
b7daeb661d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours" into sc-v2-dev-plus-aosp am: c73177f8d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79cea14d1339a9ace856c3de36c348bddbc87697
2021-07-30 14:48:16 +00:00
Bill Yi
748c6716d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 96d40908e0 -s ours am: efb958f5e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08ffaa64bd4002d3b4e714d26c51e82b8ab5f482
2021-07-30 14:48:08 +00:00
TreeHugger Robot
87507e2a84 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: 3c987fd2ba -s ours am: a9daea74f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I811e9dc5b4db235b874ec63118f1aeacf3dbbf10
2021-07-30 14:47:33 +00:00
Bill Yi
6deca0cd6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02489ddc8a2047d651d7bf64ff98a75c6c90cd6a
2021-07-30 14:42:43 +00:00
Bill Yi
96e13f3748 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 2487eee891 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If31f76873963453eac1356719387fe5ac5d4b5ca
2021-07-30 14:33:29 +00:00
Automerger Merge Worker
c73177f8d2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours" into sc-v2-dev-plus-aosp 2021-07-30 14:33:27 +00:00
TreeHugger Robot
e29ba0a2cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I056c501bfa980764b42806d977cad074ba2b8a6a
2021-07-30 14:33:17 +00:00
Bill Yi
efb958f5e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 96d40908e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92d423f5cd1acf0b03c8a51d7a4decfe16109983
2021-07-30 14:33:16 +00:00
TreeHugger Robot
a9daea74f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: 3c987fd2ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c1e922ebffee81fc15513144af34c7a6d44e52f
2021-07-30 14:33:03 +00:00
Bill Yi
36b2149d9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 54f684bdda -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e8de43464c598b5948302c4e10b4072e353cdf0
2021-07-30 14:32:47 +00:00
TreeHugger Robot
9655248eee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: 243ae3b151 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ced467458ac2c06fb50d85630279b6d50eecbf7
2021-07-30 14:32:41 +00:00
TreeHugger Robot
9afbaf6aac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 57d9cf9f25 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieeb2b8736fdaa52386321a83a5c23c404af8b8a0
2021-07-30 14:32:25 +00:00
Bill Yi
54f684bdda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91104e537f92974876be8d590f01db23257fdb48
2021-07-30 14:21:12 +00:00
Bill Yi
2487eee891 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4851fff1d80fbbd507ac78300bed7ae7141d2271
2021-07-30 14:21:09 +00:00
TreeHugger Robot
fb5770bc84 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-30 14:18:43 +00:00
Bill Yi
96d40908e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If220aa9eb626e85a6123ed5b84d99c370facd66e
2021-07-30 14:17:31 +00:00
TreeHugger Robot
3c987fd2ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d9300322d9114de041eb032258911b97f5438ff
2021-07-30 14:17:22 +00:00
TreeHugger Robot
7c5c51ee97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b6417453f9 -s ours am: f06cd4b190 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f1dceb1311bb7f717282d9ce63460d9351b5d2a
2021-07-30 14:16:41 +00:00
Bill Yi
16693aaca0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I472c9c04799848a0382c2af447d442b73bad4bd0
2021-07-30 14:16:37 +00:00
TreeHugger Robot
243ae3b151 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a7ac84fbdc83e0e2b7facfe8a157a82282d0cd0
2021-07-30 14:16:34 +00:00
TreeHugger Robot
b90e48ad64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I536a95a89ff1243f1e87e340b923564f70e7c190
2021-07-30 14:15:47 +00:00
TreeHugger Robot
57d9cf9f25 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-30 14:15:01 +00:00
TreeHugger Robot
f06cd4b190 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b6417453f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec241bd1f714d52e7ae2fd432bb85b660ae75a6b
2021-07-30 14:08:18 +00:00
TreeHugger Robot
7399e2deaa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-30 14:07:33 +00:00
TreeHugger Robot
b6417453f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-30 13:53:31 +00:00
Bill Yi
2e4581a30c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If7a3af5b6e872561b010ea6cee172ebd3d6ab8f7
2021-07-30 12:10:45 +00:00
Bill Yi
63c32865cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
2021-07-30 12:06:46 +00:00
Bill Yi
7461d69a41 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic7691c918342532cfe3cb14c2d454760c81e7dd1
2021-07-30 12:02:35 +00:00
Bill Yi
296d41309e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0e84b422b86e7195aac236b569828f1a0760ad7e
2021-07-30 11:53:32 +00:00
Bill Yi
99ef4ec5fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iab11c36fd772ae3aefc76bf063199db279be2450
2021-07-30 11:42:43 +00:00
Bill Yi
e5d2e077c7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
2021-07-30 11:39:05 +00:00
TreeHugger Robot
9c3d69b209 Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: bc39d7f73e am: 19f6e4a49e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I1fba8ff17af4db969a068abbead3e5f456480a3e
2021-07-30 08:56:00 +00:00
TreeHugger Robot
37e5684696 Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f39f9d2d3d am: 91abd1277d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I88825778dedfa6b9f2203aa63e8f2ea87b008f98
2021-07-30 08:55:49 +00:00
TreeHugger Robot
19f6e4a49e Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: bc39d7f73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I3de6a6e268a713517b5a29cbc15a7abe87844f5c
2021-07-30 08:45:31 +00:00
TreeHugger Robot
91abd1277d Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f39f9d2d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I40408cecd02422f1fa41ece7f160637294d172ca
2021-07-30 08:44:57 +00:00
TreeHugger Robot
db1a226c54 Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f719dd7a6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I5c79b7f727031f97222fa628b8865aaf2cc31a5c
2021-07-30 08:44:43 +00:00
TreeHugger Robot
f39f9d2d3d Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I3587d9793b6e62402603f2d0a7ffa66c62704b9b
2021-07-30 08:32:41 +00:00
TreeHugger Robot
f719dd7a6c Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: Iede0416114c004a9f66c8a93fdd05cd22d53ff26
2021-07-30 08:32:02 +00:00
TreeHugger Robot
bc39d7f73e Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: Ic9337fe64ae71afa60bbe6d8e3ef4a2a511b6cd9
2021-07-30 08:30:58 +00:00
TreeHugger Robot
74060d3158 Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev 2021-07-30 08:18:01 +00:00
Ahan Wu
a551ea537c Use new api to create InteractionJankMonitor.Configuration.Builder
The api to create InteractionJankMonitor.Configuration.Builder has
changed, adopt the new api.

Bug: 170708749
Test: build pass
Change-Id: I627370fed43630750eab2ec9752338fb03753463
2021-07-29 19:22:54 -08:00
Treehugger Robot
c71af48782 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164 am: bd71ddc59b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: If1d8252f6641658af7be154ebdbe118db2a9e92a
2021-07-30 03:15:07 +00:00
Treehugger Robot
bd71ddc59b Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I9d3f933e3fa5c68e34e97f9b4191022c5d0aee8b
2021-07-30 03:00:43 +00:00