Commit Graph

43155 Commits

Author SHA1 Message Date
Arc Wang
ec3ae8bb17 Fix Settings crash when setting a null ringtone
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
2022-05-16 14:36:19 +08: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
Yi-Ling Chuang
27171f5fc5 Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: c481752bf6 am: 6bafe542fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: I59d75f7353f03fbc0dd12b48a8e156bdacb545a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:54:20 +00:00
KUAN WANG
614d2dfc0b Merge "Reset Optimization Mode of apps when users reset app settings." into tm-qpr-dev 2022-05-16 05:34:47 +00:00
Yi-Ling Chuang
2e707d1191 Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: c481752bf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: If7bbcfffc952092480bb7eb953d7033f6abaa3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:19:51 +00:00
Yi-Ling Chuang
6bafe542fe Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: c481752bf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: I2d5504f5c3423b66599ae897853dbb296914646e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:19:49 +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 Chiu
da6d689633 Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f am: f26c448c1e am: c5ee465b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

Change-Id: I8e1e7fc19f40e96275b7d6ba81f0f80c3f0b0f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:44:49 +00:00
Yi-Ling Chuang
c481752bf6 Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: I8e1b840bddcc56d8a38a1f54e27ae55c6dc61d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:04:54 +00:00
Yi-Ling Chuang
cb652d47e3 Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: I24ee693aefc90721dd4e560062fdec5a7f729680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:03:15 +00:00
Jason Chiu
c5ee465b14 Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f am: f26c448c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

Change-Id: If1fc7c77f97a83e6bf640980ab2a54d9897181f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:13 +00:00
Jason Chiu
e50f38d3dd Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f am: f26c448c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

Change-Id: I2400e4ef5c4dfc39e004f837efdc61d55268aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:03 +00:00
Yi-Ling Chuang
14d31677d6 Merge "Make sure loading extra info once" into tm-dev 2022-05-16 03:26:30 +00:00
Jason Chiu
f26c448c1e Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

Change-Id: Idaef98b8499f40d355a1ae5762f9987c874057e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:18:08 +00:00
Jason Chiu
4d89bbfffb Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

Change-Id: Idaf47302e96540e79f95e510950621c7f0861d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:16:25 +00:00
Jason Chiu
44aab7c55f Merge "Refine the homepage app bar layout" into tm-dev 2022-05-16 02: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
Automerger Merge Worker
82479aa814 Merge "Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8 am: e80ef180aa" into tm-d1-dev-plus-aosp am: 48ca72af90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: I6a4f307e2422320de15b418f31b8e2467592646d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:28:53 +00:00
TreeHugger Robot
8f578a9c80 Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8 am: aecbda3822
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: I3e46fab91910a72ed995304af44324804fac4997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:15:26 +00:00
TreeHugger Robot
2f4ec4b764 Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8 am: e80ef180aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: I1b49e4d4887a3bf705aaaa5ed56368092991e879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:15:01 +00: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
TreeHugger Robot
e80ef180aa Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: Ia4fa223b9200074d8ccbf508754f81dcacbd1085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:04:13 +00:00
TreeHugger Robot
aecbda3822 Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: I27c60724c8d3c50f3d7e01561a0099e69569bf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:59:43 +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
TreeHugger Robot
ee56c24ad8 Merge "Update the 'is valid contentIntent' check" into tm-dev 2022-05-14 00:59:01 +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
tom hsu
6b3741a170 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ia4c6a946ae822c61389574b0942145c99d98250d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:55:06 +00:00
tom hsu
b02b002b5b [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add am: 9aeea1e813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ia48fabdbe6d3b621494b972439ba7f5010956dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:53:59 +00:00
tom hsu
1212ddacd3 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: I2eaf282101a8eecef145186e23367db1557ec7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:09:07 +00:00
tom hsu
9aeea1e813 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 0f38ca7add
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: I54f7195fdb522d1ed1046b84f459b267bcd8b053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:08:51 +00:00
tom hsu
0f38ca7add [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ia5f4ad7794bfffbdb607d73dc0f65f979823a958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:41:09 +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
TreeHugger Robot
25b7f85585 Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e25 am: 5b85070968 am: d89ff59f04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143

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