Becca Hughes
99f1d5448d
DO NOT MERGE Hide provider from this list if autofill provider
...
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.
Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
2023-04-26 21:23:30 +00:00
Becca Hughes
02ca65edaa
Hide provider from this list if autofill provider
...
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.
Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
2023-04-26 16:19:51 +00:00
Edgar Wang
cd74f76a43
Remove restricted icon in SettingsMainSwitchBar
...
- display disable status directly
- click disabled MainSwitchBar will show devicepolicy dialog
- make sure BT and location use MainSwitchBar correctly
Bug: 260406688
Test: manual
Change-Id: I8bb57213eec6dd5e991af580e1a06ebf8a867c28
2023-04-26 14:06:22 +08:00
Treehugger Robot
a33d6c5061
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458
am: 03ec360960
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556
Change-Id: Ic38356dae643818061a9d06b4b1a81debcc2667a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 05:11:01 +00:00
Treehugger Robot
c06abe31b2
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458
am: a71a381e59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556
Change-Id: I5a7288c2e0ac86775071d966f8238836392456bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 05:10:46 +00:00
Treehugger Robot
9cdf565458
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev
2023-04-26 03:59:47 +00:00
Fangqiu Su
14dd0af87c
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
am: 29f3d022f7
am: 924208bb0f
am: ef47b4b811
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: I533e328fda6796e068f42b5477988a2448b156ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 21:47:38 +00:00
Fangqiu Su
57d3f995d2
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
am: 378e7af38e
am: 5ce99863ea
am: 064c80b470
am: c606c6f0b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I83c8b2d6d5d145be65b546d547bdd6a70777d7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 21:47:04 +00:00
Fangqiu Su
13fdff36ea
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
am: a176782c18
am: 5ed8e6bc0e
am: 6b6044bedb
am: 0f1ca5b569
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: Ie741b7c5244982a85336078ceccc606c25fea519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:49:58 +00:00
Matías Hernández
78b7892f2f
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
am: b168628c13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I020f10a1b238245175e299a23bd3c48cdd89a241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:18:40 +00:00
Fangqiu Su
924208bb0f
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
am: 29f3d022f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: If98e04dea79ae03a0f1cfe3969df530583c66289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:44:36 +00:00
Matías Hernández
cb13bd964d
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I889dff9b16777539e8e8d9775c7ae3fe0bf462e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:37:35 +00:00
Matías Hernández
c49cb1014c
Merge "Tweak refresh of notification channel group preferences" into udc-dev
2023-04-25 14:00:14 +00:00
Piotr Wilczyński
139bc341f3
Revert "Back up the smooth display setting"
...
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3
Reason for revert: b/279215664
Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3
Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
2023-04-25 09:49:51 +00:00
SongFerngWang
539266a2f3
Replace the SlicePreference with Preference am: 794fc58235
am: c054498357
am: c070721d96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I69ce2df75d1bee0eb1ad048bc253658e9af2ca62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 09:00:40 +00:00
Fangqiu Su
064c80b470
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
am: 378e7af38e
am: 5ce99863ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I62bb7a4c90c78cf5631bdd933f8f6e0e9f64797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:59:00 +00:00
Fangqiu Su
29f3d022f7
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: I932c3dfca81798867d20625d7cc7007dabbec0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:07:10 +00:00
Fangqiu Su
5ce99863ea
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
am: 378e7af38e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I5ddfb48e1809ce7c51163d30c0e283c3b3bc5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:05:33 +00:00
SongFerng Wang
f929dc6dea
Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I25f24e707f42147d28101ed00da233b37218865e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:47:35 +00:00
Fangqiu Su
8d16e20d78
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: I03bf08855b17f3a9d95fe00b4de68e97a62f4101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:24:07 +00:00
Fangqiu Su
378e7af38e
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I5e1a6f87cc9f32c18ce84fe4d2d5a3f95ff52f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:23:50 +00:00
SongFerngWang
c054498357
Replace the SlicePreference with Preference am: 794fc58235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I5e9032624347b27acb02eafd28002744d92b5f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:23:25 +00:00
SongFerng Wang
b0f9c2deae
Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp
...
* changes:
[automerge] Replace the SlicePreference with Preference 2p: 794fc58235
Replace the SlicePreference with Preference
2023-04-25 05:52:54 +00:00
Fangqiu Su
2fba2c2316
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests"
2023-04-25 05:48:52 +00:00
Fangqiu Su
68903eb9cb
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests"
2023-04-25 05:47:24 +00:00
Treehugger Robot
e4919398a9
Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826
am: 9f7e3227bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: I660e68c1ed0fe1f833901f93c3a08adfcd732c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 05:02:17 +00:00
Zaiyue Xue
10712a43b1
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
am: 86389502e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: Ia9cd7f752b4a70459ed3f3d60e960bd20bf6a0a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:56:58 +00:00
Zaiyue Xue
c92661d0e3
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
am: a795d58ace
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: If9b18192c34b93d4aa25780db72e037d3c1931a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:54:25 +00:00
Zoey Chen
9c0ae3aa1b
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
am: d14da56ab6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Iac587978bc2de9ea4a1bbdbd6703919119acdbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:51:42 +00:00
Zoey Chen
29efe8eaf7
Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647
am: b37a320ed8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358
Change-Id: I8c2c90ccb81c1cc731a899d085b7601c480ef869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:51:21 +00:00
Treehugger Robot
885801abc2
Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: I934ee99c2e09b21e9a9c032111dbbf169bb533b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:29:03 +00:00
Treehugger Robot
ea3a970826
Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev
2023-04-25 03:59:03 +00:00
Zaiyue Xue
43ea982e9e
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: Ieef0738903ed0528826866b4539f3ee521e8e800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:45:31 +00:00
Zaiyue Xue
65347f07ce
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: I41b385d28c5df0d83c6962bc297e28da5e61e26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:44:43 +00:00
Zaiyue Xue
f3a3634aa5
Merge "Replace Screen system component time with device screen on time" into udc-dev
2023-04-25 03:32:02 +00:00
Zaiyue Xue
cfa374f997
Merge "Combine screen on time map into battery usage map" into udc-dev
2023-04-25 03:31:39 +00:00
Zoey Chen
d014b55e01
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Id22c108a702b279e8348f81fb6d84e7dd97501d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:25:49 +00:00
Zoey Chen
221a58918c
Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358
Change-Id: I10c1d03beb08f2425de8552a7a8d6697ed3b873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:23:46 +00:00
Zoey Chen
c31cf3d3b4
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev
2023-04-25 03:00:20 +00:00
Zoey Chen
1d74998647
Merge changes from topic "regional_preference_metrics" into udc-dev
...
* changes:
[Regional Pref] Remove Calendar controller and related Fragement
[Regional Pref] 1. Add metrics for user changes the First day of week 2. Refactor to Settings design
[Regional Pref] 1. Add metrics for user changes the Temperature unit 2. Refactor to Settings design
2023-04-25 02:59:27 +00:00
Fangqiu Su
6b6044bedb
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
am: a176782c18
am: 5ed8e6bc0e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: Ic9bd09f06a4cf29e220b9516846ead6b0e2e634e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:55:20 +00:00
Fangqiu Su
a176782c18
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 00:27:13 +00:00
Fangqiu Su
828f2fcec9
Update uiautomator references in packages/apps/Settings/tests/unit
...
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
"androidx.test.uiautomator_uiautomator" (v2.3.0).
Bug: 235842600
Test: mmma .
Change-Id: I55c2d77b0bcd3b673de5a0b42170414de5fc3baf
2023-04-24 18:07:07 +00:00
Fangqiu Su
643e908ec4
Update uiautomator references in packages/apps/Settings/tests/uitests
...
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
"androidx.test.uiautomator_uiautomator" (v2.3.0).
Bug: 235842600
Test: mmma .
Change-Id: I216758dc3898875c41f865f5aa25d20bf0386aed
2023-04-24 18:03:02 +00:00
Fangqiu Su
61c93dc8c3
Update uiautomator references in packages/apps/Settings/tests/perftests
...
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
"androidx.test.uiautomator_uiautomator" (v2.3.0).
Bug: 235842600
Test: mmma .
Change-Id: I19484ff3b0c7f9db24534b175c2d321ac5a30909
2023-04-24 17:49:02 +00:00
Zoey Chen
10fa1b8aec
[Regional Pref] Remove Calendar controller and related Fragement
...
Bug: 275003276
Bug: 264483854
Change-Id: I2431ea55a7a69db8a4f661a125a6ca218ce41a94
2023-04-24 10:27:10 +00:00
Zoey Chen
4aa05e58bb
[Regional Pref] 1. Add metrics for user changes the First day of week 2.
...
Refactor to Settings design
Bug: 275003276
Bug: 264483854
Change-Id: Ibea987b6e51fd76c89a0ff5269da6e99171f6b1c
2023-04-24 10:26:52 +00:00
Zoey Chen
5d2ce38d3a
[Regional Pref] 1. Add metrics for user changes the Temperature unit 2.
...
Refactor to Settings design
Bug: 275003276
Bug: 264483854
Change-Id: Ib886ace45db8cfd7dd0f468d03a0aa0551f1f5c4
2023-04-24 10:25:44 +00:00
Zoey Chen
af05cf7e0e
[Settings] UI part: Add metrics for numbers preferences
...
Bug: 275003276
Test: local test
Change-Id: I2455252f3ed7f5355a363a79076113bd4452732d
2023-04-24 10:22:03 +00:00
Matías Hernández
8c40305ad6
Tweak refresh of notification channel group preferences
...
Previously, we were discarding and re-adding all channel preference switches when a group was toggled. This caused the group switch itself to flicker and sometimes lose the a11y focus as well. Because the group toggle is always at the top, it's not necessary to ever re-sort it (which is the main reason for doing the remove+add dance).
This CL also resurrects ChannelListPreferenceControllerTest which was disabled.
Fixes: 248056830
Test: atest ChannelListPreferenceControllerTest
Change-Id: I5672c102d4571430e26ad6bee92d8c88794214ae
2023-04-24 11:39:59 +02:00