Commit Graph

13809 Commits

Author SHA1 Message Date
Edgar Wang
b9a06a9f34 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I2f7ce317b7bb9d355fbb1e5f0fc2aacb1da7f8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 00:02:22 +00:00
Edgar Wang
21ddf79998 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: If0fba8bf4c69645bf8cc6a153580ed7cda57610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:51:54 +00:00
Edgar Wang
eaa0a1cf5c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I10a24e8723d555c9bf81ee0efff9dea9d56bf736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:24:36 +00:00
Edgar Wang
24654a3d61 Merge "Update learn more string of FooterPrefernce" into tm-dev 2022-05-20 23:13:07 +00:00
TreeHugger Robot
8329fa64cc Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I6e4dd7854a850464c619869b13e3ec0712246512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:11:22 +00:00
Chaohui Wang
0f1658d013 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: c41f9a953a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: Ic3efbb187a24fba979eb16d6b1445d89a3f60cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:07:24 +00:00
TreeHugger Robot
420b448fd1 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I1735fdce61730866db7122abbb7260cff78e0688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:56:58 +00:00
Chaohui Wang
c41f9a953a Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I940d194f592ab6f9b7ea43e4e078c0914078418c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:55:13 +00:00
TreeHugger Robot
fdc8f75278 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I0c2fc9f385694c894bd8a142415401b439ce29c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:52:25 +00:00
TreeHugger Robot
4ffd6caf54 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: Ib104a1f052c0a7d6dc38bef2ec9f5293686dc1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:50:17 +00:00
Chaohui Wang
29a1747a91 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I2df4c39742f1060577c8df98d8c0854e83cc152b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:29:07 +00:00
TreeHugger Robot
fea570f524 Merge "Revert "Show previous query upon configuration change"" into tm-dev 2022-05-20 12:27:55 +00:00
Chaohui Wang
246764009c Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I172dc10ef716db79989b471b5b3bd7367264c723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:26:58 +00:00
Chaohui Wang
ca86110548 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: Ie35e6b3a663c3cfb5f72650c1c530ce7bb91ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:26:18 +00:00
Yi-Ling Chuang
e763ca1715 Revert "Show previous query upon configuration change"
This reverts commit d9453bf8c6.

Reason for revert: This introduces a new flicker which doesn't seem good. Will have another solution once all things are ready.

Fixes: 232355879
Change-Id: I0bbc4561ce4fbef36d59de15ae98705a6d81574c
2022-05-20 10:11:20 +00:00
Chaohui Wang
692068d535 Add the jank detection to Settings toggles
Add jank detection when click the following preferences,
 - SwitchPreference
   Single target, detect click in InstrumentedPreferenceFragment
 - PrimarySwitchPreference
   Two target, only detect click switch in switch's onClick()
 - MainSwitchPreference
   Single target, detect click in TogglePreferenceController
 - SettingsMainSwitchPreference
   Single target, detect click in its onSwitchChanged()

Bug: 230285829
Test: manual & robo tests
Change-Id: I97a13e05a601237b16cd2d903ba2fb6ec4a69a74
2022-05-19 12:28:16 +08:00
Kate Montgomery
0dc3640575 Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c92780ceba am: a3ecc49413
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I7e1b2ace14d95e0f71a5ce4e1230b171567a954d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 23:19:16 +00:00
Kate Montgomery
196d99198d Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c92780ceba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: Ib62a884b76001e15b2f5b5e6b0b5f507a0aefb76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:44:44 +00:00
Kate Montgomery
a3ecc49413 Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c92780ceba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I13c374f4e41b5731b1740802f2490f6d7f948f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:07 +00:00
Kate Montgomery
c92780ceba Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I01a58ec1e7f17ea67664515cfb610c937aae2d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:11 +00:00
Kate Montgomery
499e8848bc Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I52df4e0f5faef88f18e0e3cb1ba8bf4572fb2226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:47 +00:00
Kate Montgomery
d79959bd7d Merge "Flag off stickiness of show/hide system setting." into tm-dev 2022-05-18 19:21:45 +00:00
Kate Montgomery
dc67fb3283 Flag off stickiness of show/hide system setting.
Bug: 191503437
Test: atest SettingsRoboTests
Change-Id: I96e287cb870265e6ce379e64d01f134f8b3dde59
2022-05-17 14:24:41 +00:00
KUAN WANG
166c0633aa Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev am: 614d2dfc0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309249

Change-Id: Ib7e9e58435110c22bf6ca10c4cd9f4181d1f9e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:54:28 +00:00
Kuan Wang
4028e6123c Reset Optimization Mode of apps when users reset app settings.
Fix the issue that Optimization Mode is not reset when users click the
"Reset apps" button in the setting.

Bug: 222037028
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge" + emulator
Change-Id: I22fb8aa19e284e11882b2920b77b544dee4cc33c
2022-05-16 05:01:20 +00:00
Jason Hsu
6e20ed4ebc Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: 1b0b6c902a am: 41e6eb780a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: Ic4cce93bbf89bf2dc28f446abb0fbfb9853c47fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 11:02:54 +00:00
Jason Hsu
41e6eb780a Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: 1b0b6c902a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: Id37e45739bf6e1344a30f4511922983d7a203ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 10:19:35 +00:00
Jason Hsu
da448751f0 Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: 1b0b6c902a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: Ie544316dc3a3d6af0a204dd3646c799765a31b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 10:19:33 +00:00
Jason Hsu
1b0b6c902a Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: I828626ed6844804f8314e90fba766c01f161f699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 09:50:32 +00:00
Jason Hsu
403e292044 Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: Ie8e5fb7f0811b546ecbc1025ed80565fd1bbb608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 09:48:58 +00:00
jasonwshsu
02b661b7dc Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a am: cf507b603b am: 1fc03683c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

Change-Id: I53d443cb30b01ce07e80d90961df7e902f0bcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 09:26:02 +00:00
Jason Hsu
13438e6084 Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev 2022-05-15 08:35:55 +00:00
jasonwshsu
faf67c0d8f Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a am: d42a72f5cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

Change-Id: I575ebcc9e41ca7a8fcd5f6f3fb41f8184a15a89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 07:49:32 +00:00
jasonwshsu
1fc03683c2 Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a am: cf507b603b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

Change-Id: Ibbd4f11bcdd43417d188c5d77f3fdbd5bc2e589a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 07:49:31 +00:00
jasonwshsu
cf507b603b Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

Change-Id: Ib7ee39c79cbd738b169dd49469badfacaa1daa64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 06:20:36 +00:00
jasonwshsu
d42a72f5cf Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

Change-Id: Ic4a30d77bf6f2a58a24a4a897ba0d36cce2f7dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 06:19:04 +00:00
jasonwshsu
acd3f94fde Pop up pairing another ear dialog when detecting hearing aid is a set
* Pop up dialog in 'Connected deivce' page and 'Accessibility -> Hearing
  aids' page

Bug: 225117454
Bug: 226511985
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtils

Change-Id: I34a1e3ac680a7efe97dc501bfbe93f840ad16364
2022-05-14 22:16:22 +00:00
jasonwshsu
02b373522a Add mechanism to add accessibility service or activity into bluetooth 'Related' category
Bug: 225117933
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Change-Id: Iaa3593b4fd9d916fe7f96b3e4bb0965fdbbe36ec
2022-05-14 22:43:19 +08:00
Jason Hsu
047cee8fc8 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: 260e8f8ce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Ie99902f11984809b04ec9be2cf60e6a5cb607257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:25 +00:00
Jason Hsu
926beb08ff Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: de39f47311 am: 8846e29a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: I1e42a1708e166d78a3d3af72640c5f64f8b6bd4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:12 +00:00
Jason Hsu
8846e29a7b Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: de39f47311
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Ia981237c5ee0d5676c51730a078b9ee273da27bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:59:11 +00:00
Jason Hsu
260e8f8ce2 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Iaf0a85773cfc7cee8cd002ea0b35427044342ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:58:25 +00:00
Jason Hsu
de39f47311 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: Ieb1b469f29429cb1f542b03fcdced951f72aad9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:57:06 +00:00
Jason Hsu
c3bbb709b9 Merge changes from topic "hearingAidsInT" into tm-dev
* changes:
  Add 'Live Caption' preference for hearing aids device in Device details page
  Update summary in Accessibility -> Hearing aids
  Header for hearing aids now listed in one summary
2022-05-14 00:24:44 +00:00
jasonwshsu
384200a337 Add 'Live Caption' preference for hearing aids device in Device details page
Bug: 225117933
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Change-Id: Ic607fa7d10aa2049ab0852a86a57dd1d5d1ac7df
2022-05-14 03:36:01 +08:00
jasonwshsu
82d3bb2b73 Update summary in Accessibility -> Hearing aids
Bug: 225117843
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Change-Id: I19c08474349e9ae98cd3f296ba8423f920d55fcf
2022-05-14 02:06:45 +08:00
TreeHugger Robot
3ba78072f4 Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 69f35acf8b am: 762a702a3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: I232ad5d77e9b0bf9f1205899ba668048626f9f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:04:17 +00:00
PETER LIANG
9f85423ecf Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae am: 75d582768a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: Ie3bd0627c4025bf1c99daff28c96747e098a6b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:58:08 +00:00
TreeHugger Robot
762a702a3f Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 69f35acf8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: Ibda52c0679f465af74667f194b32e7e7b7ff5606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:55 +00:00
PETER LIANG
4e389f18fe Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I3e0bb2e2878d4fcd13bed21a4c4b402140547395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:47:14 +00:00