Stanley Wang
defbe1ad65
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
am: b1895fc072
am: 69eaf216eb
am: dc3ad75817
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: Ifcdac2031c098926a3f0f3dd11aef20ca331e6f6
2020-06-22 11:14:51 +00:00
Stanley Wang
b1895fc072
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: I7bda54792d81ace1bcdee9f018fb3e5f3db0fc1b
2020-06-22 10:38:04 +00:00
Stanley Wang
7afb61e6dc
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev
2020-06-22 10:25:58 +00:00
Stanley Wang
f1a0801c00
Fix the bug of not showing lock screen before entering Smart Lock page.
...
Controller can't find the target preference to handle the click event.
Store the preference keys to match the clicked item.
Fixes: 158716163
Test: run robotest and manually test the click behavior
Change-Id: Ie243206ceffef013c56c4ea29c14fe56da510fb6
2020-06-22 16:49:02 +08:00
TreeHugger Robot
3ab6e990ab
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
am: c758384eec
am: f339f5a25d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Ic02e9129f844255524ba8f9f00e3902562b68882
2020-06-22 04:24:46 +00:00
TreeHugger Robot
2b697fac94
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I97fcaa6787a5f9a205e8027d3bfe9d52fa358b6a
2020-06-22 03:44:17 +00:00
TreeHugger Robot
fbabf8f251
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev
2020-06-22 03:27:01 +00:00
Arc Wang
fb2b144413
Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment"
2020-06-21 14:25:18 +00:00
tim peng
4d956498e4
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: 9ff43d2fa3
am: 593d62d992
am: 826cd4f88f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I7caf8d437cfd45979b1e33882c38d65c4fa43f63
2020-06-20 11:05:46 +00:00
tim peng
9ff43d2fa3
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ida3ffa1110238057993e4ce345dce3cb3a8791d6
2020-06-20 10:25:04 +00:00
tim peng
02e311e537
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev
2020-06-20 10:12:03 +00:00
Mill Chen
a99b8799ee
Make Telephony related PreferenceController un-sliceable
...
Since the structure of Telephony is changed, some of Telephony
related PreferenceController cannot be converted to slices
smoothly whether devices have mobile data or not. So we
decided to make them un-sliceable.
Bug: 155846002
Test: robotests, manual
1. Settings -> Settings search -> search for roaming
2. Check that roaming result has no toggle widget.
Change-Id: I7cba8f6a750d9780a59411942665f68dac61248c
2020-06-20 08:20:07 +00:00
TreeHugger Robot
229e76ec19
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
am: 731e6d8e5f
am: d9d63ebea6
am: 33e5429474
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I0254419c2d5f1b6ac97afbbde0b06fdd696feedd
2020-06-20 05:08:27 +00:00
TreeHugger Robot
731e6d8e5f
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4
2020-06-20 04:43:49 +00:00
TreeHugger Robot
5b849d8ac8
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev
2020-06-20 04:35:24 +00:00
Tim Peng
aeabfc3050
Add a separate line at the bottom of list area in output switcher
...
-Bottom divider is not showed when there are more than 7 devices exist in output switcher
-Check panel type in isDividerAllowedBelow()
-Hide the Slice bottom divider of Output switcher panel
-Show divider in panel layout only for output switcher panel
Bug: 159177275
Test: make -j42 RunSettingsRoboTests
Change-Id: I49396a0ee0543b494a2b3d714ec248ebab08e7ba
2020-06-20 03:44:43 +00:00
SongFerngWang
36796a1616
NetworkModePreference's list needs to allow values set from overlay.
...
Root cause: ag/10614943 removed the resources, so each of item
values is hard coded. This broke the overlay. This CL adds the
resource back so the overlay can work.
Bug: 159301925
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: Id5ad2fdd0a87586136e4a26d2e44cf5278df5d9d
2020-06-20 11:21:18 +08:00
Beth Thibodeau
43834d78ff
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ib4fffb001ffe58da7e0a9ed759dc75c475b3ae8a
2020-06-19 22:40:24 +00:00
Beth Thibodeau
0b152c29d0
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev
2020-06-19 22:26:59 +00:00
TreeHugger Robot
992d31cd03
Merge "Add BatteryStatusFeatureProvider"
2020-06-19 14:02:13 +00:00
Arc Wang
97659b2dfc
[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment
...
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie6f63cb8aa81d61bfa41687c73f8c8764cb3cefe
2020-06-19 19:15:42 +08:00
Automerger Merge Worker
871c15dcce
Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
am: a68b7cc6bf
am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp am: 510920bab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083
Change-Id: I78d46ffd65eb69b12f0ae3a01aff47454803145c
2020-06-19 06:44:11 +00:00
TreeHugger Robot
a68b7cc6bf
Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083
Change-Id: Idc85a865b5579bc08dbb4b0e6b92726bb2e6cf08
2020-06-19 05:44:52 +00:00
TreeHugger Robot
e8e4e4bafc
Merge "Remove the feature flag of contextual home V2" into rvc-dev
2020-06-19 05:06:12 +00:00
Jason Chiu
d489acb2e3
Remove the feature flag of contextual home V2
...
Bug: 159393461
Test: robotest & rebuild
Change-Id: If5f030b4c8bd5ef61bb722da9ae7f3ace0ac6e0e
2020-06-19 11:23:57 +08:00
TreeHugger Robot
3e032c93b5
Merge "Update notification subtext" into rvc-dev am: 141153e789
am: 385e9be34f
am: 73ebf35f81
am: 399e5e3d7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I2309a23cb2c461d5893571ef63561888ec14afcb
2020-06-19 02:04:33 +00:00
TreeHugger Robot
385e9be34f
Merge "Update notification subtext" into rvc-dev am: 141153e789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I9f48f9e9fc98eee8ae3df94135c0baac9783429e
2020-06-19 01:16:42 +00:00
Beth Thibodeau
13f3e8f04b
[DO NOT MERGE] Add toggle for media resumption
...
Adds a toggle under Settings > Sound > Media to toggle media resumption
Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="MediaControls"
Change-Id: I803c57031bc3252cab35c06ea124d1c22a3c3aeb
2020-06-18 23:58:34 +00:00
Alex Mang
4368da2e23
Merge "Add flag to allow NAS to indicate adjustments on notifications and solicit feedback."
2020-06-18 20:38:06 +00:00
Julia Reynolds
03a42fd844
Update notification subtext
...
Test: atest
Fixes: 159274325
Change-Id: Iff98b4b056bf7a3c6386063d6588a26607ee7525
2020-06-18 16:25:38 -04:00
Jason Chiu
2de51f92f2
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I69b8345c0d34a77326b7dd86f4ad52edeedc0b02
2020-06-18 15:09:51 +00:00
TreeHugger Robot
d2ea0b8e37
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I79cee4ac6d5c40605be2a20c69cf39d213ceaa28
2020-06-18 15:08:07 +00:00
Jason Chiu
3e7ae1b547
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: e623f69f29
am: a4e005e0ef
am: cab15b0d65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I183c512bfec686df0e9c3de50fc7252ccff66663
2020-06-18 12:03:52 +00:00
Jason Chiu
a4e005e0ef
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: e623f69f29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I7fa7892e91b9db37728930fcf70652b891ba765d
2020-06-18 11:36:26 +00:00
Jason Chiu
251b98492f
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev
2020-06-18 11:06:42 +00:00
Jeffrey Carlyle
4e2071ae78
Add BatteryStatusFeatureProvider
...
This allows the battery header status line to be overridden.
Bug: 150239363
Test: implemented provider and changed status line text
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com >
Change-Id: I05bedbee641f087de5ee1b25a00724ce2de51f87
2020-06-18 01:50:36 -07:00
Jason Chiu
0625bb4815
Fix the overlapping problem of the burst of slice updates
...
Implement a throttle in SliceBackgroundWorker to control slice updates.
Test: robotest
Fixes: 152366832
Change-Id: I8b65d1b57973e036b932172627aca506f4fae3a4
2020-06-18 02:18:38 +08:00
TreeHugger Robot
dc841d4f80
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
am: f6afc2658f
am: 6a7a3b70b9
am: 00b3b49673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I20f60a71a7c43dfd55cf91f096b6388a74c0b2f7
2020-06-17 12:53:17 +00:00
TreeHugger Robot
6a7a3b70b9
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
am: f6afc2658f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I7a61c3d9e51062a3ed4779517573960c4fd1ee95
2020-06-17 12:27:07 +00:00
TreeHugger Robot
16e1cd296a
Merge "Add new Always on display slice" into rvc-dev
2020-06-17 12:04:21 +00:00
Edgar Wang
e1186254d4
Add new Always on display slice
...
Currently we create Always on Display slice through
AmbientDisplayAlwaysOnPreferenceController. However, as the Always on
Display is merged into Idle lock screen, the conversion won't work
properly anymore when devices support the aware sensor.
Hence, we create another custom slice for this purpose.
Bug: 145920511
Test: manual & robotest
Change-Id: Ifd90e2de5219bd4e97aa13b5855fdab95ff6c4d0
2020-06-17 07:52:01 +00:00
Automerger Merge Worker
f880829325
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2" into rvc-d1-dev-plus-aosp am: efa8cb6206
am: 2a33b85f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I5f66d25e41a8c484f65861109482b0c9e56b249c
2020-06-15 09:34:17 +00:00
Amy Hsu
156d912ce2
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I1a3e8410a9e31ab3fa1e324cfe6d8759ba8515c2
2020-06-15 08:45:50 +00:00
Amy Hsu
f9a021511e
Merge "Add Smooth Display option to developer in Settings" into rvc-dev
2020-06-15 08:39:26 +00:00
Mark Chien
75b2a75ccd
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
am: 78b4bc6020
am: 1912ee3e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I78a0a2d461fd96f2af1850c74d78cd34060e66cc
2020-06-15 07:20:22 +00:00
Mark Chien
78b4bc6020
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I38b762a4ad65059c737b962e87944b5f99ffc377
2020-06-15 06:55:17 +00:00
Mark Chien
ccdefc1ea5
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I8800bc4ae09b3ce8d318a81dbeee9afe17e57b8f
2020-06-15 06:39:57 +00:00
Mark Chien
49b74e24d6
Merge "Remove schedule recheck logic from TetherService" into rvc-dev
2020-06-15 06:23:11 +00:00
SongFerng Wang
832a6e54af
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
am: c2f0ab12d8
am: 86aa01ea4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Iefd7c8b53d1b57ecaafde5d9c4756d4f5338cfd4
2020-06-15 03:44:07 +00:00
Yanting Yang
3fc7639cee
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
am: c75c3ce3b3
am: be4dbdbea4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Id7f84e04a85a1c00c5fd172d451d140769008b8c
2020-06-15 03:43:43 +00:00