TreeHugger Robot
e3e74e137d
Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
am: 7514aebc80
am: ab0bb410a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682
Change-Id: Ibf9d8533df8eece94410478d487eb507abdd01dd
2021-06-21 12:44:38 +00:00
TreeHugger Robot
5f428cefac
Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
am: 54bb0bd2fb
am: 184ca3591f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652
Change-Id: I99a46d8dbfc998cc707ef351078ff71d93b5d298
2021-06-21 12:42:34 +00:00
TreeHugger Robot
ab0bb410a3
Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
am: 7514aebc80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682
Change-Id: Ie8906f73efc1c7591f7e53e26d94001b14080d52
2021-06-21 12:29:47 +00:00
TreeHugger Robot
184ca3591f
Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
am: 54bb0bd2fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652
Change-Id: I721768e83c6e45c5f6386cd6308fea6e6d8dd38a
2021-06-21 12:18:24 +00:00
TreeHugger Robot
7514aebc80
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: I71b6663e9580e72f382b465d53904698e18c2f5d
2021-06-21 12:15:02 +00:00
TreeHugger Robot
54bb0bd2fb
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: I672d10f3e7549026a9a9cff35237e4c53001ad58
2021-06-21 12:14:42 +00:00
TreeHugger Robot
5b2b10ecbf
Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
am: f59cd6f8b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689
Change-Id: I75b84d720a30f124d89b8872e0cd5fcc50ced997
2021-06-21 11:54:39 +00:00
TreeHugger Robot
f59cd6f8b2
Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689
Change-Id: I8a21021ec7ba09633b172262e056fd06ec531000
2021-06-21 11:43:44 +00:00
TreeHugger Robot
3928e0b4f1
Merge "Clean up unused code" into sc-dev
2021-06-21 11:25:35 +00:00
YUKAI HUNG
225bd45261
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
am: 814dd75918
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683
Change-Id: I347894b649bd47134b6e211765e1e1e71583b2a2
2021-06-21 11:13:46 +00:00
YUKAI HUNG
814dd75918
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683
Change-Id: Ib2d4e8212d39b0ab4f4098cda8ebfa37a326e310
2021-06-21 11:02:16 +00:00
TreeHugger Robot
cd370669c6
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
am: 52d5a488ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685
Change-Id: I49df71d22400f346632b63613365d8fd96e7d25a
2021-06-21 10:57:44 +00:00
TreeHugger Robot
ab318df647
Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
am: 5617cb9466
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578
Change-Id: I6e2b2d96de9e56594cead45f37f088f9153917cd
2021-06-21 10:57:37 +00:00
YUKAI HUNG
a0d61f253a
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev
2021-06-21 10:47:31 +00:00
TreeHugger Robot
52d5a488ca
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685
Change-Id: Idecdf187bb0feb79c0c19c634a261f9816ebed63
2021-06-21 10:42:42 +00:00
TreeHugger Robot
5617cb9466
Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578
Change-Id: If0dd03a21b1985a1ffb37d66599f38e871a02ac4
2021-06-21 10:42:37 +00:00
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
503219b316
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev
2021-06-21 10:33:34 +00:00
TreeHugger Robot
f4a1b19c12
Merge "Update the image for Fingerprint Finish page" into sc-dev
2021-06-21 10:29:34 +00:00
Tsung-Mao Fang
53f94d3289
Clean up unused code
...
Test: Rebuilt apk
Fix: 190142194
Change-Id: I16d18c538b612c6049f561bb524ee1e056255714
2021-06-21 18:17:27 +08: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
Mill Chen
6f93ac0eec
Update the image for Fingerprint Finish page
...
Fix: 188733201
Test: visual verified
Change-Id: Iebb9eaa201ac5481df0104b9394dbc9959aa0c52
2021-06-21 17:20:00 +08:00
Jason Chiu
272c7627e1
Fix A11y broken on Draw your pattern again page
...
Fixes: 190146459
Test: manual
Change-Id: I613e1db10334c06358bfa8d84770fb083ea12095
2021-06-21 17:18:34 +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
ykhung
e322f02b18
Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value
...
in the new design, we should store all data into the databae for showing
the battery history, we should not filter the items first from the
consumed battery value threshold
Bug: 191468827
Test: make SettingsRoboTests
Change-Id: I19d971fc5cdcc40af1693dc8ba2c78586da22d49
2021-06-21 16:43:18 +08: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