Sam Dubey
48eae58586
Revert "Add configuration for defaulting notification behavior" am: a2d06273c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171
Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-17 14:01:32 +00:00
Sam Dubey
a2d06273c1
Revert "Add configuration for defaulting notification behavior"
...
Likely causing b/259499400
This reverts commit a92688d642
.
Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
2022-11-17 07:33:18 +00:00
Treehugger Robot
1b70bcbdc4
Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a
am: 425521478a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183
Change-Id: I84c783493a82247653fdc60932a0383d0c74d61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 09:40:56 +00:00
Treehugger Robot
425521478a
Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183
Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 09:08:59 +00:00
Binyi Wu
5b4cae3900
Merge "Update survey triggering mechanisms" into tm-qpr-dev am: d5d2dc4e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454690
Change-Id: I1b60ec07a8eb8efae0859051c923adb13bf07e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 07:55:53 +00:00
Binyi Wu
d5d2dc4e22
Merge "Update survey triggering mechanisms" into tm-qpr-dev
2022-11-16 07:13:53 +00:00
Yu
0aed038b0a
Make p2p start searching after turning off airplane mode.
...
In the P2P page, p2p stops searching when airplane mode is turned on, and should start searching when airplane mode is turned off.
Bug: 255249207
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Signed-off-by: Yu <zhangyu34@xiaomi.com >
Change-Id: I71d5eb6c3d8533417e8ae9ac09e7fac73983644e
2022-11-16 12:19:23 +08:00
Betty Chang
f200134fc4
Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007
Change-Id: I5195b9513c575bc28f0b6930a6c40c570048f6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:10:44 +00:00
Betty Chang
c8f6bba271
Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev
2022-11-16 02:28:08 +00:00
Adam Bookatz
632754a466
Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629
Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 01:23:04 +00:00
Adam Bookatz
9703f6a154
Merge "Introduce concept of DockUser" into tm-qpr-dev
2022-11-16 00:59:41 +00:00
TreeHugger Robot
54170343cf
Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246
Change-Id: I3f6ad58e5f8292642d7eb958402d172537536d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 23:00:52 +00:00
TreeHugger Robot
e2e892d46c
Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev
2022-11-15 22:42:34 +00:00
Adam Bookatz
e5e232428d
Introduce concept of DockUser
...
Dreams and docking often refers to "user zero" or "system user".
But more generally, the special user for dreams or switching-to-on-docking
need not be user 0, and in fact won't be in certain modes. So this needs updating.
Test: the files mentioned in the topic
Bug: 257333623
Change-Id: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
Merged-In: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
2022-11-14 19:19:21 +00:00
Binyi Wu
7078a7662c
Update survey triggering mechanisms
...
Settings will send the Settings screen to a central decision-making
place instead of each page handling its own.
Bug: 236662190
Test: robotest, manual
Change-Id: Ibfbdd421c723158d8d317aa4a02d9b51f877316a
Merged-In: Ibfbdd421c723158d8d317aa4a02d9b51f877316a
2022-11-14 19:56:03 +08:00
Steve Elliott
a92688d642
Add configuration for defaulting notification behavior
...
Test: RedactionInterstitialTest
Test: go through SUW on a phone
Bug: 240472040
Change-Id: I7bcd9f1a128c757881693e0251d305d2e26e4fd8
2022-11-11 14:08:09 -05:00
Treehugger Robot
cf573d51c6
Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918
am: 0ecb9e76fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917
Change-Id: I8047a4e55b534076ac9fb65e99934fe7d3a3e695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 12:17:57 +00:00
Treehugger Robot
0ecb9e76fe
Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917
Change-Id: I7477f18dc0e0a0aea9adf8e996171210dc194ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 11:48:15 +00:00
Bonian Chen
647e3fe4e5
Merge "[Settings] Improve PremiumSMS's auto test" into tm-qpr-dev am: 30ce9a78ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20429443
Change-Id: I712b90a9a09ebb2bfe064f4e6a37930d2b977bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 10:24:00 +00:00
Bonian Chen
56e5d50ca7
Merge "[Settings] enhancing data saver config control" into tm-qpr-dev am: 106fd86520
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419511
Change-Id: I5338c24812346b79068b1fee0c5ba98ff07eec33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 10:23:48 +00:00
Bonian Chen
86e2948eb6
Merge "[Settings] Hide data usage when SIM support is turn OFF" into tm-qpr-dev am: a6824c9b34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419510
Change-Id: Ie433daffbe56a1a526880c2e254a13ff17aaa3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 10:23:44 +00:00
Bonian Chen
30ce9a78ee
Merge "[Settings] Improve PremiumSMS's auto test" into tm-qpr-dev
2022-11-11 09:35:42 +00:00
Bonian Chen
106fd86520
Merge "[Settings] enhancing data saver config control" into tm-qpr-dev
2022-11-11 09:35:21 +00:00
Bonian Chen
a6824c9b34
Merge "[Settings] Hide data usage when SIM support is turn OFF" into tm-qpr-dev
2022-11-11 09:35:21 +00:00
TreeHugger Robot
7578a43c94
Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev am: b0503be6fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20336174
Change-Id: I9a92a7de4f517330604673ce97bb1a626f824626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-11 03:41:29 +00:00
TreeHugger Robot
b0503be6fd
Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev
2022-11-11 03:10:06 +00:00
Bonian Chen
b4511365cb
[Settings] Improve PremiumSMS's auto test
...
Fix PremiumSMS's test case when config_show_premium_sms is false.
Bug: 240515161
Test: test cases and local testing
Change-Id: I3f1710bcf2c123553af7646c030bfe87f569324a
2022-11-10 15:11:36 +00:00
Bonian Chen
2a6792540b
[Settings] enhancing data saver config control
...
Enhancing the control of R.bool.config_show_data_saver when false, which including:
1. Initial presentation is invisible
2. Leaving UI when triggered
3. Avoid from getting searched
4. Robolectric test case support
Bug: 243877672
Test: test cases and local testing
Merged-In: I909522c0244ebb012a27d6aff34120a4f90128c6
Change-Id: I909522c0244ebb012a27d6aff34120a4f90128c6
2022-11-10 11:23:20 +00:00
Kuan Wang
28bdf84b5a
Remove the timestamps of last day for battery level chart if last day has less than 2 hours data. am: 57cb76428e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309948
Change-Id: Ifd9c932a870117e278c59af45c6a57132831de5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-10 11:14:37 +00:00
Zaiyue Xue
240ff56875
Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55bfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410009
Change-Id: I89a8e622134524f701e440a9bd3e2cf0c84fae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-10 09:33:08 +00:00
Kuan Wang
57cb76428e
Remove the timestamps of last day for battery level chart if last day has less than 2 hours data.
...
Test: make RunSettingsRoboTests
Bug: 256525782
Change-Id: I3f735f8f3ec10b2952b93111f0243e44117ff58a
2022-11-10 08:56:39 +00:00
Shen Lin
e8a0ba688b
Fix potential crash in AppAllServicesPreferenceController
...
This CL contains two fixes:
- Fix potentialcrash when calling getAvailabilityStatus, we should use
the latest packageName to decide.
- Add test class
Bug: 258270151
Test: atest
Change-Id: I3e6aa7e0773a73d2e3dfa996e42087f3ec80627b
2022-11-10 10:18:14 +08:00
Bonian Chen
d3b35f24f0
[Settings] Hide data usage when SIM support is turn OFF
...
Enable the UI control through configuration.
Bug: 240515161
Test: local, auto test
Merged-In: I5e49a2b0f2b563b426354f4d2e6e650dcc02c98b
Merged-In: I4e0db5688dc1b074d43f9d77dd2f6d4cc53a353c
Change-Id: I4e0db5688dc1b074d43f9d77dd2f6d4cc53a353c
2022-11-09 10:52:35 +00:00
Zaiyue Xue
866203a3b8
Fix b/257404630 Inconsistent strings in battery chart
...
Change all the "from last full charge" to "since last full charge".
Bug: 257404630
Fix: 257404630
Test: presubmit
Change-Id: Ib316e9fecac60f388e2b1810de9a65c540c52358
Merged-In: Ib316e9fecac60f388e2b1810de9a65c540c52358
2022-11-09 02:39:22 +00:00
changbetty
c706aa6108
Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-08 08:50:29 +00:00
Bonian Chen
af96b1ea7a
Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
15f0cd6428
Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
ab2e7bf6a5
Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
0eab03a862
Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
0b80576a34
Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
3423f0cb9b
Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Arc Wang
c8fd92dc66
Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
am: 923ba5fcb2
am: 5292e9e085
am: 76f12ccdca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285
Change-Id: I695908089058699e6cea14385c4261a69e821159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-06 06:23:27 +00:00
Arc Wang
76f12ccdca
Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
am: 923ba5fcb2
am: 5292e9e085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285
Change-Id: Icb4fc96a1fe5903b7d09157d552c6782b6db2036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-06 05:56:25 +00:00
Arc Wang
5292e9e085
Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
am: 923ba5fcb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285
Change-Id: I66b28ac40ee6c50c10e51cff6844c17f91ac5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-06 05:26:26 +00:00
Arc Wang
923ba5fcb2
Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285
Change-Id: I766b9fa3ccd6c7d690275292b84efbddb19c651e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-06 04:23:18 +00:00
Bonian Chen
bf55048799
[Settings][Back port] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
(cherry picked from commit 2b048b22f0
)
2022-11-04 07:06:23 +00:00
Wesley Wang
8deb159e35
Fix app battery usage list launch incorrect works app
...
- App usage page only use package name to launch the page, it can not
identify the different userId between normal app and work profile
app, add extra userId info into launch args
- Remove no battery usage state/string if usage time is empty
Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
Merged-In: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
2022-11-04 06:05:55 +00:00
William Escande
dabdd6faa9
Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev am: a364c8bacb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378665
Change-Id: Id9ddd49d48825e90f8414360363ad85a0a5068cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-04 04:55:28 +00:00
William Escande
723df89aaa
Fetch currently loaded bluetooth name
...
Test: m
ROBOTEST_FILTER="BluetoothMaxConnectedAudioDevicesPreferenceControllerTest"
RunSettingsRoboTests -j40
Test: m ROBOTEST_FILTER="com.android.settings.bluetooth" RunSettingsRoboTests
Test: Open developer settings
Bug: 257158801
Change-Id: Ib40a6264d8d6908103d76b6401ddcfd3ffa7dd88
2022-11-04 03:05:41 +00:00
Behnam Heydarshahi
6b156be280
Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104
Change-Id: I7321b1bfe1e7d89924b38cd6adf2853d336740d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 16:15:00 +00:00