Betty Chang
4375590837
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228
Change-Id: I06611c86c0db787198031edcf10d1d60217d577c
2021-11-18 06:30:27 +00:00
Betty Chang
21967a6ff8
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev
2021-11-18 06:18:08 +00:00
TreeHugger Robot
2fc75eba80
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev
2021-11-18 03:25:05 +00:00
Matt Pietal
d8ca5298ec
[DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
changbetty
39ebb7c9a8
Remove feature flag for provider model in wifi settings
...
Bug: 206338507
Test: manual test
Change-Id: I1ec83c94f801b489bcc716a6d78cbe7beab9638f
2021-11-17 15:57:14 +00:00
Matt Pietal
cb4836b486
[DO NOT MERGE] Allow a settings override for double-line clock
...
This setting allows users to always show a single-line format clock,
regardless of notification status.
Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
Kevin Chyn
156db33a56
Disable combined controller only if all modalities require consent
...
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.
Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest
Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
YUKAI HUNG
a1d72c11c5
Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114
Change-Id: I2d78a4287aa740f1e583c8f570d52c2dc8d90bf7
2021-11-10 09:50:59 +00:00
ykhung
101dc6878a
Fix incorrect usage for the logging method to cause no data in WW
...
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only
Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I9f1d157c77df9bd74f441105318790a2505a9c01
2021-11-10 15:39:30 +08:00
TreeHugger Robot
0f6c95d4fd
Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939
Change-Id: I38c253e43ca1165916550503b13276bcf23b672a
2021-11-10 02:18:39 +00:00
ykhung
64e49a9393
Fix "battery saver" not in the top seaching result for indexing
...
Bug: 204964119
Test: make SettingsRoboTests
Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
2021-11-10 00:11:09 +08:00
TreeHugger Robot
22b763486d
Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930
Change-Id: Iefc9f1b9719bd1cc57bf79d7d8d873a4f4dbc995
2021-11-09 15:22:38 +00:00
ykhung
48c3533cd0
Fix incorrect usage for the logging method to cause no data in WW
...
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only
Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I0ca87ca96647f025adbd23f9f93a3cbd5f7d8579
2021-11-09 21:01:40 +08:00
Hugh Chen
be094163b8
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956
Change-Id: I6572efe48fb0ad0159e0177459d1929aaa4f86ce
2021-11-09 07:24:27 +00:00
TreeHugger Robot
8072964193
Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev
2021-11-09 06:58:39 +00:00
TreeHugger Robot
cd467e99d8
Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770
Change-Id: I670cde971b45484e54b951a90e507acc7ef0c1dc
2021-11-08 16:34:32 +00:00
Julia Reynolds
42896d7fe1
Check if pref is disabled by admin
...
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
2021-11-05 18:07:58 +00:00
TreeHugger Robot
ac476ff63b
Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316
Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29
Merge "Remove the text for untethered bt device" into sc-v2-dev
2021-11-04 04:08:45 +00:00
TreeHugger Robot
631c67dc8e
Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219
Change-Id: I248616eaed0c9c3d19612d702b97e851f1847e2a
2021-11-04 03:07:48 +00:00
TreeHugger Robot
12b7fd54ec
Merge "Add package name check for the calling app" into sc-v2-dev
2021-11-04 03:01:33 +00:00
Hugh Chen
ab3a70cf1e
Remove the text for untethered bt device
...
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
2021-11-04 02:52:37 +00:00
Jason Chiu
3b3203cd50
Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571
Change-Id: Ib9b823860dc063f1295d329491c0f8c7f99a4d89
2021-11-03 12:23:46 +00:00
Jason Chiu
80dd47633c
Merge "Search experience improvement for large screen" into sc-v2-dev
2021-11-03 12:08:35 +00:00
Jason Chiu
e427cc6752
Search experience improvement for large screen
...
- Support fragment and direct link in SearchResultTrampoline
- Start activity for SI case and start deep link trampoline for others
- Disable menu highlight whenever the search bar is clicked
- Don't overwrite SettingsApplication's homepage activity in
SliceDeepLinkHomepageActivity
- Scroll to highlighted menu entry after homepage is loaded to prevent
UI overlapping
Bug: 201724410
Test: manual, robotest build pass
Change-Id: I5115d17d829e85036000da2e80f0e5b0598c733f
2021-11-03 18:44:01 +08:00
Wesley Wang
e67f12f9b7
Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444
Change-Id: I033d0ff341cae7cdb320abebfd1da765c6fa8e74
2021-11-03 06:55:06 +00:00
Wesley Wang
bf9f91f0ad
Merge "Move optimization mode backup timing into onPause" into sc-v2-dev
2021-11-03 06:41:42 +00:00
TreeHugger Robot
3be2b733f2
Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324
Change-Id: I4639aea50ec1cdb528f4f300c59550194f89ca60
2021-11-03 05:29:56 +00:00
TreeHugger Robot
b4e13a7af0
Merge "Adjust optimize page logging timing" into sc-v2-dev
2021-11-03 05:17:40 +00:00
Wesley.CW Wang
9b6eac28f3
Move optimization mode backup timing into onPause
...
- Move to onPause to avoid some corner case (like kill apps from recent
app won't trigger onDestroy)
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
2021-11-03 12:38:10 +08:00
Wesley.CW Wang
7fb4cbf005
Adjust optimize page logging timing
...
- Log the optimize mode only when leave this page and mode changed
- Update mOptimizationMode at onResume to make sure the state is sync
with framework
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iab116220cd7d2b1bdb1c170c4b47016c763bf4fe
2021-11-03 12:05:15 +08:00
Jason Chiu
026b1b5df6
Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654
Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32
Merge changes from topic "slice-highlight" into sc-v2-dev
...
* changes:
Add highlight menu keys for all toggle pref controllers and custom slices
Support slice deep links highlighting menu entries
2021-11-02 02:14:09 +00:00
TreeHugger Robot
137f9acac1
Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630
Change-Id: Ic9d497517b6778c413909917d485575a054dc331
2021-11-01 08:07:13 +00:00
TreeHugger Robot
c6a5bcc933
Merge "Optimize battery optimize page control flow" into sc-v2-dev
2021-11-01 07:53:21 +00:00
Hugh Chen
58d81fbbb4
RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
...
- Only enable device can be discoverable when the user launch
"Connected Devices settings" through settings and systemui
Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
2021-11-01 06:56:12 +00:00
Wesley.CW Wang
151b88f76f
Optimize battery optimize page control flow
...
- Post the setup logic into background and setup once only when leaving
this page, this can improve the performance since we won't setup
every time when switching preference
Bug: 195306545
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I1c3ee4673cf5cdba0abe39f208dfb1412082c579
2021-11-01 14:52:42 +08:00
Jason Chiu
594eb43159
Support slice deep links highlighting menu entries
...
- Add an interface to get highlight menu key resource in Sliceable
- Force implementing the new interface in TogglePreferenceController and
CustomSliceable at syntax level
- Update the slice index db schema
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: I0b5068bccd04f1590023de7f3385bc0a4c6fa47b
2021-11-01 14:27:34 +08:00
TreeHugger Robot
4ef8d14ed7
Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16056987
Change-Id: I7b9a5992c671ed304e3ad2cdec7f546d6c77b446
2021-11-01 02:50:16 +00:00
TreeHugger Robot
17df1ff01f
Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev
2021-11-01 02:41:30 +00:00
TreeHugger Robot
babbff7b82
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
am: c26248da5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: Ib6922d82c5c6d7a059b8c43beefb12d554c3f3c0
2021-10-27 19:28:38 +00:00
TreeHugger Robot
c26248da5b
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
2021-10-27 18:52:28 +00:00
TreeHugger Robot
3d353e63e2
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I6057ce7a0de2ff19f662564a538a891d9c37c553
2021-10-27 18:52:19 +00:00
YUKAI HUNG
22a28d3f7e
Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev am: 0ed32fca75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115940
Change-Id: I953a2e45433c6f7c563392ab98272261b37f3e9e
2021-10-25 17:02:36 +00:00
YUKAI HUNG
0ed32fca75
Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev
2021-10-25 16:49:01 +00:00
ykhung
36a57f4720
Fix the ExpandDividerPreference will flash one time in some corner cases
...
Bug: 204051529
Test: make SettingsRoboTests
Change-Id: Iaead6d2a596cbbf0281045b40e4b00f23ceb9f09
2021-10-25 22:22:49 +08:00
TreeHugger Robot
5c422e7ed2
Merge "Fix broken tests" into sc-v2-dev am: c07317f5a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16114300
Change-Id: Ic270be5214f6b795c3345ab88bc895842527f93b
2021-10-25 12:31:37 +00:00
TreeHugger Robot
c07317f5a1
Merge "Fix broken tests" into sc-v2-dev
2021-10-25 12:15:57 +00:00
Tsung-Mao Fang
1083ca0b90
Fix broken tests
...
Test: Run presubmit
Bug: 204031530
Change-Id: If95afeff91b2fb81b18bfdf6005ba785c6dc1525
2021-10-25 17:22:01 +08:00