Commit Graph

105032 Commits

Author SHA1 Message Date
TreeHugger Robot
d10c148d38 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-16 07:38:50 +00:00
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
Yi-Ling Chuang
54891b0c0d Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: cb652d47e3 am: 33e4d8dc5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

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

Change-Id: I2a6782c095d1480b1f6fe0a05fc5046c435f7acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:54:42 +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
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
33e4d8dc5a Merge "Make sure loading extra info once" into tm-dev am: 14d31677d6 am: cb652d47e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350202

Change-Id: Icb711ca8b4a5b8f56f1ed1ca606f76999fbbe03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:20:00 +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
15b107ed6d Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f am: 4d89bbfffb am: 111eaa1c9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

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

Change-Id: I902b3537a140e2b03b2215497c15de22b3b38661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:45:11 +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
111eaa1c9c Merge "Refine the homepage app bar layout" into tm-dev am: 44aab7c55f am: 4d89bbfffb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332035

Change-Id: I894a975e09bbb31c96ad9e9c5d5297ab1a2ab43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:14 +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
Bill Yi
e958634cc6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifd0b6f1e99b321e7c3fa34e488c0a0e135409cf4
2022-05-15 08:34:23 -07:00
Bill Yi
93bd223fdf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I22b6b49e7e863f61ad757532f8c4a7b6ccb286cb
2022-05-15 08:30:14 -07:00
Bill Yi
6aadac2448 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d3a009cbf24589f47133461c8f6b375bb7e98c2
2022-05-15 08:26:30 -07:00
Bill Yi
01c81a73dd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibef46fd05db5bc5dda73069ace97dfa007af74e5
2022-05-15 08:24:56 -07:00
Automerger Merge Worker
fa6c14aa5f Merge "Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: 403e292044" into tm-d1-dev-plus-aosp am: 4a349650d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

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

Change-Id: Idc11f980d82d38a29e869200a1789131427142d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 11:03:11 +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
Automerger Merge Worker
4a349650d3 Merge "Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: 403e292044" into tm-d1-dev-plus-aosp 2022-05-15 10:19:36 +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
a5744e107f Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: 403e292044
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: I0ec03aadb6b749f5641ec9728b38ef088f280e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 10:19:34 +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
Automerger Merge Worker
351045e9e6 Merge "Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a am: cf507b603b" into tm-d1-dev-plus-aosp am: 6473e775f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

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

Change-Id: I08308793aab45830fdb0d8766eb1a74578c168f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 09:26:22 +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
Automerger Merge Worker
6473e775f0 Merge "Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a am: cf507b603b" into tm-d1-dev-plus-aosp 2022-05-15 07:49:39 +00:00
jasonwshsu
d4b927b7cf 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: I2f8f86d892c90894878feaea167780ac445fb95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 07:49:33 +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
TreeHugger Robot
2ca8e0fca5 Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8 am: aecbda3822 am: 8f578a9c80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

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

Change-Id: I43ad37461465348dc7b67f7c99614d1d7a8ad3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:37:06 +00:00