Commit Graph

89707 Commits

Author SHA1 Message Date
Syaoran Kuo
c93a4ec841 Merge "Add test case for dark theme scheduler." 2021-06-21 10:34:59 +00:00
TreeHugger Robot
216aa028d2 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 19fa17e3b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I5b8a319b15e3e7ff487b3460799ac94764e25878
2021-06-21 10:33:43 +00:00
TreeHugger Robot
19fa17e3b4 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: Ic5bd304be3a125627f8815cad79985521cea2783
2021-06-21 10:13:47 +00:00
TreeHugger Robot
dbaad0436d Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev 2021-06-21 10:00:14 +00:00
TreeHugger Robot
551fc31f2a Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 2c3e71368f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: Iada9d106209fdcf02f79c0efb16241a0b875f3e0
2021-06-21 09:48:38 +00:00
TreeHugger Robot
2c3e71368f Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: I2f11be88f23681f093b905e072c4e9f171c019ac
2021-06-21 09:35:23 +00:00
Yi-Ling Chuang
c55b2cef2a Revert "Suppress Shared Axis transition on the SIM dialog"
This reverts commit 5e8a3947d2.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I0d4756797914ac5bcb37dde31e80dc4cd45fcd6b
2021-06-21 09:32:01 +00:00
Syaoran Kuo
278b1e8cce Add test case for dark theme scheduler.
Bug: 189722519
Test: atest com.android.settings.display.darkmode.DarkThemeScheduleComponentTest
Change-Id: I94cbff123af0eaef7834aa636e3b38c6da3f2235
2021-06-21 17:27:41 +08:00
TreeHugger Robot
23222388c1 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev 2021-06-21 09:17:32 +00:00
TreeHugger Robot
9ca6a13da6 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 33eb3bf53e am: c88a3b34c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: Idf0efaf2d143b27fd17cf33f4c22f746dfac0e9a
2021-06-21 08:43:47 +00:00
TreeHugger Robot
c88a3b34c6 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 33eb3bf53e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I2e4b14305fd92fb6c69d1ff1285c7afb83a164ca
2021-06-21 08:24:25 +00:00
TreeHugger Robot
d9398f5fd4 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: c9887edbb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I6ab780214133058ebf4a0c51fd58fba74d54bce1
2021-06-21 08:23:59 +00:00
TreeHugger Robot
33eb3bf53e Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I0feef8ebc111c93654cb621e78a59392028c2dae
2021-06-21 08:09:30 +00:00
TreeHugger Robot
c9887edbb2 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I608b43e73d04da0f15640fc3b7ce9406e83a3dde
2021-06-21 08:08:18 +00:00
TreeHugger Robot
b5b519dd85 Merge "Remove the duplicated skip lock screen setting" into sc-dev 2021-06-21 07:54:30 +00:00
TreeHugger Robot
00468dc5c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: 86ee46b1f8 -s ours am: 08cdb43331 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I167d232d462dd8eb2493af15f93888b48647b230
2021-06-20 18:50:37 +00:00
Bill Yi
3dc1b50af7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: 3b1538a6d6 -s ours am: c54f7381cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5bb104ec56169733e2a28cc5dc645fe220cedf3
2021-06-20 18:50:28 +00:00
TreeHugger Robot
bc31119201 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: 2ac1b8e36e -s ours am: 58a9735197 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab838a354299a8c21f3db855360edf0ffe5f3d5d
2021-06-20 18:50:18 +00:00
Bill Yi
370b17c830 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: 3df426dc72 -s ours am: 5c6b65645d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6db254cbd7345c3f5fa2ff9cd7c65f2176de322
2021-06-20 18:50:08 +00:00
Automerger Merge Worker
cc85b1dc8a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: a4f4365870 -s ours" into sc-v2-dev-plus-aosp am: 43de77e6b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8000abf45238c2056af8de2bf4eea8b6bcdfbf00
2021-06-20 18:49:58 +00:00
TreeHugger Robot
0976c24b5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: b80251b7bc -s ours am: 85ebd314aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I333147c8f72f2a272b3bbdcb01efe70a4955f82a
2021-06-20 18:49:48 +00:00
Bill Yi
f22024c8e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: afab5c94b9 -s ours am: db8f6e743a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5052481aee6ac00297ef1773e8bd7b98453819b
2021-06-20 18:49:33 +00:00
TreeHugger Robot
b842bca93d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: d942057a8c -s ours am: 984efdef5f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I931ec8fcc783e6c77d47d07656a1ef03c49fe1db
2021-06-20 18:49:23 +00:00
Automerger Merge Worker
46f1dc89e1 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: eb1b956aae -s ours" into sc-v2-dev-plus-aosp am: 142ee38e5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1877ff2c452feb2936228c0c221756c757a49d36
2021-06-20 18:49:05 +00:00
Bill Yi
ff5a4afd31 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 34c7574de2 -s ours am: 75e8aa0a2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieeac7ba64fe63a630824dc29c2ddf9402366baed
2021-06-20 18:48:31 +00:00
TreeHugger Robot
5c0becb832 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: 90ea72a84c -s ours am: 5f7b4091f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9dd1f2c4838903a2e6929577ebed05f62d8c220
2021-06-20 18:47:50 +00:00
Bill Yi
16ae4f1160 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 44b78dc633 -s ours am: 884f6e4402 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93c350e52043f6b16184d2c0ca8444e9b2a7b37b
2021-06-20 18:47:10 +00:00
TreeHugger Robot
08cdb43331 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: 86ee46b1f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icaee3dffdf23ccda730390da8c1cbbbb7e58b550
2021-06-20 18:39:10 +00:00
Bill Yi
c54f7381cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: 3b1538a6d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54f941512c2d22867eadaaa233adc828dc00a9fe
2021-06-20 18:39:04 +00:00
TreeHugger Robot
58a9735197 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: 2ac1b8e36e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia621227460f8609a71cf93f1fe7faffa4a133564
2021-06-20 18:38:57 +00:00
Bill Yi
5c6b65645d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: 3df426dc72 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If97223a508a52472800383c7df8672b343aafab0
2021-06-20 18:38:49 +00:00
Automerger Merge Worker
43de77e6b0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: a4f4365870 -s ours" into sc-v2-dev-plus-aosp 2021-06-20 18:38:38 +00:00
TreeHugger Robot
3c85cd471f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: a4f4365870 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1441940c6dd52b967d2e137990f37e361f90ec93
2021-06-20 18:38:36 +00:00
TreeHugger Robot
85ebd314aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: b80251b7bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a4b536540a0d1acf3bbe5172e882d275fab481d
2021-06-20 18:38:34 +00:00
Bill Yi
db8f6e743a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: afab5c94b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia856129f4fbccd21278cb2070eb7e19560475fe9
2021-06-20 18:38:30 +00:00
TreeHugger Robot
984efdef5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: d942057a8c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90ef2c9f0a2cf412f551465406824fb6ba643aaa
2021-06-20 18:38:23 +00:00
Automerger Merge Worker
142ee38e5e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: eb1b956aae -s ours" into sc-v2-dev-plus-aosp 2021-06-20 18:38:18 +00:00
Bill Yi
e5c421fd92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: eb1b956aae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b0c568edaf2dc52624f3d91f0477a9ee95b3065
2021-06-20 18:38:16 +00:00
Bill Yi
75e8aa0a2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 34c7574de2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I989c7aadab28e3473d4e27099ee2fba5d650ee4d
2021-06-20 18:38:12 +00:00
TreeHugger Robot
5f7b4091f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: 90ea72a84c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1a5e3147d8d3b1bb3b9e0b5f996465d0e2906af3
2021-06-20 18:38:05 +00:00
Bill Yi
884f6e4402 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 44b78dc633 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0596c94bb2cd9eebfe366f896a447b2b2e7f2a84
2021-06-20 18:37:42 +00:00
TreeHugger Robot
0ae410858b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: ea0673a482 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id704f8461d48666ca6662b62792de64f6421f8f5
2021-06-20 18:32:06 +00:00
TreeHugger Robot
ea0673a482 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94f129d38674ea2657f8f5d65bb87d3a15d0021d
2021-06-20 18:28:09 +00:00
Bill Yi
b98adfd0a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: d9fd5449d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dc1a301dea5287475108733220d62475ed073d4
2021-06-20 18:28:04 +00:00
TreeHugger Robot
597d8d012c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: 576e89d615 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a019b8e4da64a99b5de669f54a4a919f0553804
2021-06-20 18:27:58 +00:00
TreeHugger Robot
b80251b7bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cc2691368444aebf7ba33328f30af422e54d6bc
2021-06-20 18:27:56 +00:00
Bill Yi
b32308803a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: 327e1a7fbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9824a4c0bd776b8bb1388cb21fc1ed4d8012b16e
2021-06-20 18:27:54 +00:00
Bill Yi
d9fd5449d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6a407b2a04954e646a4d632d7f25f4a90712e5f
2021-06-20 18:27:51 +00:00
TreeHugger Robot
53563608e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: 6698bf6b03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I273b2fa91d252990a9049d7950e531dc423dc0f8
2021-06-20 18:27:49 +00:00
Bill Yi
76d1f8cbcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 3bc187fdf9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0947486fa4ae2a05c6443f01f8e571600c0429c9
2021-06-20 18:27:45 +00:00