PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,787 Commits 1 Branch 0 Tags
ea25009e67374edac9765293df5ea5d6edcfe0b8
Commit Graph

104787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abel Tesfaye
ea25009e67 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 am: 6cda44f810 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: I0e5b7509771be6166e719da4604bddffb22b8992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:46:13 +00:00
Menghan Li
21679fdaf9 Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c am: caf42f2cc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712

Change-Id: Ic889b5a640662656b0b9ab3790a1cf685f5ade69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:46:03 +00:00
Abel Tesfaye
6cda44f810 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: I2d2fe276a2d0841da10c15e6a3a7dada1dc69d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:36:44 +00:00
Abel Tesfaye
3adc967449 Merge "Add accessibility string description for auto rotate" into tm-dev 2022-04-20 21:31:23 +00:00
Menghan Li
caf42f2cc7 Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712

Change-Id: I7a88099ca0aac552e8608bf3d066ff1030f9f1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:27:14 +00:00
Menghan Li
ef9178146c Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev 2022-04-20 21:05:29 +00:00
Bonian Chen
ee0756f684 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" 2022-04-20 16:54:04 +00:00
PETER LIANG
15809b88a7 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: eff73403b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: Iee16bf249ba960089108f55ff76d30e0c6bfc8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 16:13:49 +00:00
TreeHugger Robot
6f996f5299 Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: a02cd9a9a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: Id223c21c0a2ebccd023996568753b8dd62b1a327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 16:11:43 +00:00
Bill Lin
37e401cf1a Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 2f571e625b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: Iadca46cc270eeb5aa6672f37cea43cd0fab9d3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 16:04:59 +00:00
Bill Yi
4f244d1285 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours am: 1387d55ef6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9efcd4d0ed7fbde9ef8964bef9dcff7af1e927ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 15:59:43 +00:00
Bill Yi
86481bed5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours am: e40f48737c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f127347eebb3af9f07ea37c9fcaa69eaa46a4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 15:59:39 +00:00
Bill Yi
86286d9d90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours am: 58b1768062 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id574c0669d405cf567cb7fbe6ab8bb2dee9e9c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 15:52:59 +00:00
PETER LIANG
eff73403b7 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I543d48929fffe3e7da4f218bcf99a7feeca143e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 15:01:57 +00:00
TreeHugger Robot
a02cd9a9a6 Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: I4da83ee7f9175771ae83660daacffd9528911e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:58:39 +00:00
Bill Lin
2f571e625b Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: If52256798af1ea847e4106939a424695c8ca27e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:56:37 +00:00
Bill Yi
1387d55ef6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd019c9a58d2d6c6ae77e7cbb7fe49caab4a969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:54:39 +00:00
Bill Yi
e40f48737c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbbfd334549063018382a15eadf92793eefe1df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:54:38 +00:00
Bill Yi
58b1768062 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a275c4accf1366db2fe012dc11202a1ab30bfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:51:11 +00:00
PETER LIANG
b579c1aa43 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607 am: 37fa12e2d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I078115b77edc9cd16a8ac4c5eb56f88b2048f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:07:51 +00:00
TreeHugger Robot
747e75a53a Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: 7906685ce3 am: b52b7e797a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: Iad90429168b95b1f972fb85e7cfb0cfb3f7469b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:03:24 +00:00
Bill Lin
be2b0b652e Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 7f0e76eed5 am: b8e2c1c1d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: I7d2ece7318a9b2364265d8c564ecc75d03b6b38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 14:00:54 +00:00
Xin Li
b7dacb658f [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours am: f6cf1a9647 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I614fa3b0d22969f47b7320d7ab562cb17e7f9b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:49:46 +00:00
Bill Yi
523852d4a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours am: 15e7eb7203 -s ours am: 338893d6bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97ca6478d749a96880eac0e3d949cd8ea1cd0acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:34:48 +00:00
Bill Yi
8ccb998c5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours am: a3f7f1e2d3 -s ours am: 01d9af3b7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6e41ad3dde4ae0b28aff2612b26b25be52535cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:34:46 +00:00
PETER LIANG
37fa12e2d6 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I74bb43797299b183a40f9050b6256e768361c7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:20:24 +00:00
Bill Yi
4210988326 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours am: a9d2537dd3 -s ours am: bd48eefab5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa9c11a709b574cee9e050e428e2670d78728c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:12:53 +00:00
Xin Li
f6cf1a9647 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I32af4fccfe0a22eeac73c78cf6420a2b0f5bc77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:05:28 +00:00
PETER LIANG
cc4af05607 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I14be163454ca16655f88e1d9195e891e065c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:01:07 +00:00
PETER LIANG
8cb0439d9c Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev 2022-04-20 12:37:22 +00:00
Bonian Chen
3cf84f393c Merge "[Settings] Code refactor for async Lifecycle listening" 2022-04-20 12:26:17 +00:00
TreeHugger Robot
b52b7e797a Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: 7906685ce3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: I5ffe17cbfb8f0ce475866c786d8423e9ac11ccae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 12:23:32 +00:00
Bill Lin
b8e2c1c1d7 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 7f0e76eed5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: I826e1d904b99e0f378bd5b2d51cc4516b583ba61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 12:17:15 +00:00
Bill Yi
338893d6bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours am: 15e7eb7203 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic19659624c96c7a82383ed59eeaf130e92a0f726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 12:15:57 +00:00
Bill Yi
01d9af3b7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours am: a3f7f1e2d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47800129ad56b6c4aaa505793f8b92efe3f42cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 12:15:55 +00:00
Bill Yi
bd48eefab5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours am: a9d2537dd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19284e0bcf5d1ad7e7d0a66a8e98993044efacbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 11:49:08 +00:00
menghanli
a9e6e8c811 Fix quick settings tooltip changed when color correction fab clicked 
Root cause: Users click on color correction fab to make foreground activity recreate. When recreated, the ag/13472947 makes the MainSwitch updates to ON status and get the callback for #onPreferenceToggled. It pops up the direct-use style tooltip rather than the edit style tooltip.
Soluton: Reference #updateSwitchBarToggleSwitch to early returns if values are same.

Bug: 229167631
Test: Manual testing
Change-Id: I6781fd509db7538898ad6ff0ae47124c9b9e1bc5
 2022-04-20 19:18:43 +08:00
TreeHugger Robot
7906685ce3 Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: If973fe7c16a0e95e427d9a8ac87dda932ce836eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 09:17:21 +00:00
Bill Lin
7f0e76eed5 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713

Change-Id: Id4c92e867feaeadef932fdbe49523c24a56d48d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 09:16:45 +00:00
Bill Yi
15e7eb7203 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie58a8685aa939716c4ef151c77806e8ae8c8484e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 09:15:28 +00:00
Bill Yi
a3f7f1e2d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6b36eadbe9b183987fcbf3fd4dec6f34938e721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 09:15:27 +00:00
Bill Yi
a9d2537dd3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3032d5101f8e2f2b2f7e4a199811f818e878d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 09:10:42 +00:00
Bonian Chen
5d2a76cbb4 [Settings] Code refactor for async Lifecycle listening 
This is an extension of LifecycleCallbackAdapter.
A postResult(T) and a Consumer<T> is designed for supporting pass result
back to UI thread, and is invoked only when required.

Bug: 229689535
Test: unit test
Change-Id: I0ef5afc31cd23aa865a2dd1d05f9b212242c2e41
 2022-04-20 16:45:08 +08:00
TreeHugger Robot
f792528a8f Merge "Check null BT profile to prevent crash" into tm-dev 2022-04-20 07:43:49 +00:00
Peter_Liang
b833fe1bad Should popup the confirmation toast after clicking the reset button. 
Goal: Users may not notice what the change after resetting all settings configs in the Text and reading options. So we will use the toast to give nice feedback for them.

Fix: 220126995
Test: make RunSettingsRoboTests  ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: Ife42b0c9d8a0241d7b8c3e5dbe7f9f1e2a6d759a
 2022-04-20 15:39:11 +08:00
Bill Lin
426f8a58e1 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev 2022-04-20 06:17:35 +00:00
Xin Li
61ee596f86 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours am: c5d14a8728 -s ours am: 843b2da970 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ifd2ded9b514e9ece0281c5529ea42bbd81a8acff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 06:17:14 +00:00
Bill Yi
2e39766a1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2edb7f5be9795a90d85fe3a328c870df2278a761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 06:12:31 +00:00
Bill Yi
a20fed1d1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I754ea0efc92ac2178e7d6b64773e46536109897f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 06:12:30 +00:00
Bill Yi
cc6641c043 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ecd596c4f3d96940cca64a5296acc451039d79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 06:06:21 +00:00