Chaohui Wang
d86d25445f
Merge "Clean up unused resources"
2022-07-13 08:50:25 +00:00
Jason Hsu
1059b2d3c4
Merge "Fix test case fail in HearingAidUtilsTest"
2022-07-13 07:40:18 +00:00
Jason Hsu
20f06012f6
Merge changes Ib9cb9b6d,I85209170
...
* changes:
Change updatePreferenceOrder() to onCreateView()
Migrate to DashboardFragment in ToggleFeaturePreferenceFragment
2022-07-13 04:32:22 +00:00
jasonwshsu
86c95fc7ab
Fix test case fail in HearingAidUtilsTest
...
Root Cause: Only happen when running `make RunSettingsRoboTests` not
happen when running `make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest`. It is dependency test case fail when other tests also have AlertDialog pop up alerady.
Solution: Move ShadowAlertDialog reset before running each test, not after running each test.
Bug: 238829557
Test: make RunSettingsRoboTests
Change-Id: I32da4ee87580b4f475556905f7574b211a69b29b
2022-07-13 12:30:01 +08:00
Chaohui Wang
57df989bbf
Clean up unused resources
...
Bug: 234570979
Test: presubmit
Change-Id: I1b683c3eb50b76577cf62c8a7e119e2f1eefe4ee
2022-07-13 11:02:10 +08:00
Menghan Li
ae9d768549
Merge "Add SearchIndexable to improve search coverage"
2022-07-12 22:52:12 +00:00
TreeHugger Robot
60fb901f24
[automerger skipped] Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev am: 51d087cd67 am: 005876ae80 -s ours
...
am skip reason: Merged-In I3e3cdd3a0225228bf76f6750f6a56f031666720f with SHA-1 315c78b8e2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235232
Change-Id: I49b750ec405a8e998ea9c357b6cbc4b4a7204ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 17:22:57 +00:00
TreeHugger Robot
0931e3895c
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a am: a51b1baeaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726
Change-Id: Ib9c678e1bcb7dcc562301a1f039f20eb7d3caccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 17:22:43 +00:00
TreeHugger Robot
005876ae80
Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev am: 51d087cd67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235232
Change-Id: Ic7576a9592b3b9ef71af52001c02f0db17a41312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 16:56:03 +00:00
TreeHugger Robot
a51b1baeaa
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726
Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 16:54:06 +00:00
TreeHugger Robot
51d087cd67
Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev
2022-07-12 16:47:13 +00:00
jasonwshsu
15c73a5f83
Change updatePreferenceOrder() to onCreateView()
...
Root Cause: change preferences' order in onViewCreated() will see the
order moving animation.
Solution:
* Move to onCreateView() can avoid seeing the order moving animation.
* Move onProcessArguments() to onCreate() to let it be called as early
as possible. Also let it align the calling getArguments() behavior in
parent class PreferenceFragmentCompat.
Bug: 171272809
Test: make RunSettingsRoboTests ROBOTEST_FILTLTER=ToggleFeaturePreferenceFragmentTest
Change-Id: Ib9cb9b6df232ddcb681683ac2fcd2c6406c7a487
2022-07-13 00:41:00 +08:00
jasonwshsu
8145631ab8
Migrate to DashboardFragment in ToggleFeaturePreferenceFragment
...
Root Cause: ToggleFeaturePrefreferenceFragment becomes heavy when more and more features come in.
Solution: Mirgrate to DashboardFragment, a plugin-style preference controllers, can help us separate the preference and its logic into its own controller.
* This is the first step for the whole migration. Change to extend DashboardFragment and fill up the missing override functions.
* Reorder fields and functions to the recommended general approach.
Bug: 171272809
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I852091700a4b3b3c7bbdbc82f0b5dc47c087d61c
2022-07-13 00:40:55 +08:00
TreeHugger Robot
fedab69c9a
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev
2022-07-12 16:40:32 +00:00
Menghan Li
c825a0bdc9
Merge "Remove obsoleted code: DividerAllowedBelowPreference"
2022-07-12 13:01:50 +00:00
Automerger Merge Worker
ae3622a425
Merge changes from topic "am-a9e26c3082994f7bbaad0b98192988d9" into tm-qpr-dev-plus-aosp am: fade53b067
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: Ic72f95a4b0c4bb75a0cfa9dc9a5bc01c6d614572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 06:28:15 +00:00
TreeHugger Robot
d5f8493333
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: 0996cb11ee -s ours am: d620c34d5d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: Ia4b408857b13748dc0ab56652e6e39b2ec90085c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 06:27:50 +00:00
TreeHugger Robot
83a2862813
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: c2908edff1 -s ours am: bc13166ecb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: If7605f89bc5e3fedf4fc50394880499152a08f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 06:21:42 +00:00
Bill Yi
49c9d3d421
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: fd7fcb1094 -s ours am: 4781a12d96 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: Ib0d289f0bb5d34b147c22b6e740ef2fceaecbad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 06:21:21 +00:00
Menghan Li
32a24032e8
Merge "Remove obsoleted code: DividerSwitchPreference"
2022-07-12 06:18:28 +00:00
Automerger Merge Worker
fade53b067
Merge changes from topic "am-a9e26c3082994f7bbaad0b98192988d9" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: 0996cb11ee -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: 28d5ffe9a8 -s ours
2022-07-12 05:46:20 +00:00
TreeHugger Robot
d620c34d5d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: 0996cb11ee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: I56e4bfdf0190d197f3bc00a7a3d7287de8258703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:45:12 +00:00
TreeHugger Robot
bc13166ecb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: c2908edff1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: I4a255d4da726411e182e92ca2b65758b77bcc618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:44:56 +00:00
Bill Yi
32381c7e8b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: 28d5ffe9a8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: I5333f30565a106b7cbc0bbb1d338769bfc189122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:44:53 +00:00
Bill Yi
4781a12d96
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: fd7fcb1094 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: If4d8e99c928af01463aebee593b3e199f969a1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:44:32 +00:00
TreeHugger Robot
c2908edff1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: I43af99d9dbdedea318fd7d53bf341629efb56624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:19:43 +00:00
Bill Yi
fd7fcb1094
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: I67076fc837020ff031bb770a9174889dc3e28284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:19:17 +00:00
TreeHugger Robot
0996cb11ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: I0db9d786ee29749691bd8093a1482a4035a16b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:18:25 +00:00
Bill Yi
28d5ffe9a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408
Change-Id: Ib108c314f79f1fc0cc71ec9cb37b6d4f33e3bc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:17:57 +00:00
Amy Hsu
3d2023b439
[automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: ef540c685d -s ours am: bb1c1a9954 -s ours
...
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c457 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: I517b56b5b83fc7031e1633fe5d68ce9d98b44b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:06:57 +00:00
Amy Hsu
25bd14a556
[automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: f51951c9d3 am: a067fba01f -s ours
...
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 99f86db37f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: If4af94c92a01acd22e06b37827618f192ebdc786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 05:06:34 +00:00
TreeHugger Robot
0e046fc4ae
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-12 04:54:58 +00:00
Amy Hsu
bb1c1a9954
[automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: ef540c685d -s ours
...
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c457 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: I9792a751ac493ecf4435a19f129d5590bedc1752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:48:32 +00:00
Amy Hsu
a067fba01f
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: f51951c9d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: If81fa8f115b89eb458b02736276940d8148458e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:47:15 +00:00
Amy Hsu
ef540c685d
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:31 +00:00
Amy Hsu
f51951c9d3
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev
2022-07-12 03:54:27 +00:00
menghanli
5209a10e9f
Remove obsoleted code: DividerAllowedBelowPreference
...
Settings don't show divider in material design. The DividerAllowedBelowPreference is not used now.
Bug: 197695932
Test: make RunSettingsRoboTest
Change-Id: Id2b28f76c4ed8c429594bf786690499fb3f2503a
2022-07-12 11:28:11 +08:00
menghanli
ab6cbea3fd
Remove obsoleted code: DividerSwitchPreference
...
Settings don't show divider in material design. The DividerSwitchPreference is not used now.
Bug: 197695932
Test: make RunSettingsRoboTest
Change-Id: I3fef9401b5c4a3e7d4ca6fc966f3e60c57558cdd
2022-07-12 11:23:55 +08:00
menghanli
6c85a215de
Add SearchIndexable to improve search coverage
...
- Add searachIndex test
- Increase accessibility framework feature fragment coverage
Bug: 197695932
Test: make RunSettingsRoboTests
Change-Id: Icb7e2cf70bb0443304af7866efd48bed1d9af5bf
2022-07-12 10:51:59 +08:00
Amy Hsu
c9bf3e88e7
Merge "[RRS] Activate investigation of screen_resolution in settingsstats"
2022-07-12 01:51:06 +00:00
Robert Luo
11b53f770a
[automerger skipped] Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev am: bc66c0aba9 am: 55db71536c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: I05a0aa98351e8a99adfe7035a0422d7d5139a7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:16:46 +00:00
Hugh Chen
f5a6c7ef2a
[automerger skipped] RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8 am: e88be4859c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: Idedebad669e6d5a0dd63355cd238499cb89ff9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:16:42 +00:00
Robert Luo
55db71536c
Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev am: bc66c0aba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: I6e7fa3acabc6b9fff62eb73fe2c47a915c4f13f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:00:20 +00:00
Hugh Chen
e88be4859c
RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: Ida6c1387588887b78f33de9f655b5397d04c4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:00:14 +00:00
Robert Luo
bc66c0aba9
Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev
2022-07-11 23:36:02 +00:00
TreeHugger Robot
2d39ecf2ee
[automerger skipped] Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev am: f38e8e6194 am: 92e7da84e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: Ia804ea786ff69d3e4aca6244df33d5cf5ecfd8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:28:23 +00:00
Hugh Chen
50a1e950a6
[automerger skipped] RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5 am: 95d2add6a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: Id0f7e8c9f724b5b814f15e47b3ba8f58f1bd6947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:28:16 +00:00
TreeHugger Robot
92e7da84e2
Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev am: f38e8e6194
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: Ib61748c3a5bfd25049c4020a162b067584fb037e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:09:54 +00:00
Hugh Chen
95d2add6a2
RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:09:47 +00:00