Commit Graph

103751 Commits

Author SHA1 Message Date
TreeHugger Robot
a607e20ce5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d10c148d38 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882

Change-Id: I49825190a24c9ca309adccf03d50ccfb496169a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 08:15:41 +00:00
Bill Yi
af0f88f108 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6aadac2448 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397882

Change-Id: Ib68c0d4c26747aa7b22f1ef5ef534f76d0ff05f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 08:15:25 +00:00
TreeHugger Robot
d10c148d38 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-16 07:38:50 +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
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
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
6aadac2448 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d3a009cbf24589f47133461c8f6b375bb7e98c2
2022-05-15 08:26:30 -07: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
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
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
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
b0ea0a762c 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: I5bf4cd428ab8a9cb73f244a86d385b96400a7ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:15:49 +00:00
Automerger Merge Worker
48ca72af90 Merge "Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8 am: e80ef180aa" into tm-d1-dev-plus-aosp 2022-05-14 01:15:07 +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
032e4974a4 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: I0aa0b235876da0db9d099fab7565d1a56d203089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:37 +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
727f8befe8 [Panlingual][Settings] Add top intro on the top of app list. am: 36693d8096 am: 6b3741a170
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349646

Change-Id: Ifd927cef892ad4036df24b555ff714c0c61d5342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:26:57 +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
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
Julia Reynolds
688c5c900d Update the 'is valid contentIntent' check
Existing check required that the original request code be 0,
but that's not actually required for the intent to work on this
page

Test: tap on email notification in history, be brought to email
page and not main email list page
Fixes: 232495202

Change-Id: I120022535ddbde19003f2db6f1b81a983d00789d
2022-05-13 17:37:52 +00:00
tom hsu
36693d8096 [Panlingual][Settings] Add top intro on the top of app list.
- show a message for app selection of user to avoid any confusion of
   searching app.

Bug: b/230689178
Test: see b/230689178
Change-Id: I597e718b81bd7a5019c69dbdfc02f26d7f3af5fd
2022-05-13 16:31:36 +00:00
Automerger Merge Worker
f05a81b1b9 Merge "Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 69f35acf8b" into tm-d1-dev-plus-aosp 2022-05-13 15:55:43 +00:00
TreeHugger Robot
a0f8358212 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: I1bd9f7f85d3e05cff297c691b584fffdaaf74dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 15:55:31 +00:00
TreeHugger Robot
aa5b3916ff Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: cba2f35898
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

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

Change-Id: I6d14376f410953d14e6981a51cb47a13e77473b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 15:43:10 +00:00