TreeHugger Robot
|
bc9c14e450
|
Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 32a55b93f7 am: 11c55d019d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755
Change-Id: I9011de13a6f459e62808c2a5827372e43c473307
|
2021-06-21 17:30:37 +00:00 |
|
Xin Li
|
f7a4d22949
|
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours am: 4d789befc6 -s ours am: 845c880234 -s ours am: 41ea853ca2 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1741495
Change-Id: Ib0b9a264a910cdc0be586a5f9cf742f300d8756a
|
2021-06-21 17:22:57 +00:00 |
|
TreeHugger Robot
|
11c55d019d
|
Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 32a55b93f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755
Change-Id: If329d76496c2a921754fe9cf0499960001b2a4ce
|
2021-06-21 16:18:51 +00:00 |
|
Xin Li
|
41ea853ca2
|
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours am: 4d789befc6 -s ours am: 845c880234 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1741495
Change-Id: I792fb187e40341054129156cdf52b7762be60a30
|
2021-06-21 16:14:37 +00:00 |
|
Jason Hsu
|
921e433926
|
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 5ae801442d am: 1ff9797a13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: I838f23e72516d69d6c74e7e8fe3657244036322d
|
2021-06-21 14:17:18 +00:00 |
|
Jason Hsu
|
1ff9797a13
|
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 5ae801442d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: Icbea561601335307469ee8d655457ec0b4516063
|
2021-06-21 14:02:45 +00:00 |
|
Jason Hsu
|
1ddbf04f88
|
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 82531a695b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: Id4fb63ef6a5bd335fe52cb8c3fd4e7d776045f34
|
2021-06-21 14:02:21 +00:00 |
|
Jason Hsu
|
5ae801442d
|
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: I72b11f39dd09ddc92b21fbfea62dcadc6ee7dbaf
|
2021-06-21 13:48:09 +00:00 |
|
Jason Hsu
|
82531a695b
|
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: I040bdb7288bb02993ebe6a9de20b2dad59e2d442
|
2021-06-21 13:47:18 +00:00 |
|
Jason Hsu
|
34961821f4
|
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev
|
2021-06-21 13:32:49 +00:00 |
|
TreeHugger Robot
|
ae12cea123
|
Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: 251d3a27f3 am: 34e7bde17f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689
Change-Id: Ib1cdae33fa7e35ce57a70bf8f5dabd73e42c64a9
|
2021-06-21 12:52:24 +00:00 |
|
YUKAI HUNG
|
4a047c5afe
|
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a am: 2c8ffaa10e am: c077641fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683
Change-Id: I0cbef141fbe231ffbfb91926e3588c68f0700026
|
2021-06-21 12:52:08 +00:00 |
|
TreeHugger Robot
|
08ef06b010
|
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316 am: 189a5dfb7b am: 5a3d92624f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685
Change-Id: Ifac4696b96c007e2446c78ef5b0caf6499e37960
|
2021-06-21 12:51:35 +00:00 |
|
TreeHugger Robot
|
6181b98680
|
Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 73f3a0d290 am: a658e81ea3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578
Change-Id: Iff272f79173f8d7731175178e3412f3136547938
|
2021-06-21 12:50:16 +00:00 |
|
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
|
34e7bde17f
|
Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: 251d3a27f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689
Change-Id: I24a07e793fa1bca59b023002587b602ee37b0789
|
2021-06-21 12:30:08 +00:00 |
|
YUKAI HUNG
|
c077641fc0
|
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a am: 2c8ffaa10e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683
Change-Id: Id5bad44827d97323fcd9867ddd45e20b2b56f247
|
2021-06-21 12:30:04 +00:00 |
|
TreeHugger Robot
|
5a3d92624f
|
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316 am: 189a5dfb7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685
Change-Id: I357bb8eefbfdd375b34425c3cd0c60d217bf3409
|
2021-06-21 12:29:59 +00:00 |
|
TreeHugger Robot
|
a658e81ea3
|
Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 73f3a0d290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578
Change-Id: I18f41523d1d1d514afd710eec00505960facc4bb
|
2021-06-21 12:29:54 +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
|
251d3a27f3
|
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: I3c1d23136d733282b2cbc7215f94d88449fbc852
|
2021-06-21 12:21:40 +00:00 |
|
YUKAI HUNG
|
2c8ffaa10e
|
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: I752da2c44a477cfc86fe3c8e80ffdffebb63e32e
|
2021-06-21 12:21:17 +00:00 |
|
TreeHugger Robot
|
189a5dfb7b
|
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: Idabfa542612b20df39f51d06cd5838729c1e31ce
|
2021-06-21 12:20:44 +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
|
73f3a0d290
|
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: Iec1e16c2bf5f4568c589da8d4c9dc0282abba813
|
2021-06-21 12:15:32 +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 |
|