Hugh Chen
ccf1ae76aa
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours am: a2d6c9a087
-s ours am: eab5e61360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: I6e029d7e570255074ef9487829d29a8a44629703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:34:06 +00:00
TreeHugger Robot
166900f537
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2
-s ours am: 04cc0c8073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I8f0bdcb3619a7b0a1b75b371437e89454b1e30f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:33:59 +00:00
Hugh Chen
ad2004b17a
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489
-s ours am: 6774dbbe03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I167f358d67e6e35514af4b316e267931728f9112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:33:58 +00:00
TreeHugger Robot
6f1d70a7b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Ia663b76f3371691c0e43e49f43e293069ba7822c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:20 +00:00
Bill Yi
0dfd96e976
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I35197080d628e6ef4bfeb3ae8535eb7e9dcfaeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:06 +00:00
Bill Yi
ad24a2815a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I61cf06d1e8f06e3c018231e8d809068353f8c026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:44:48 +00:00
Bill Lin
3db69adf01
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev
2022-05-18 01:43:56 +00:00
Hugh Chen
eab5e61360
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours am: a2d6c9a087
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: If614dae2b5a69b82c149cbd87bb7e3b31002457a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:31:22 +00:00
Hugh Chen
a2d6c9a087
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: Iace915bd93f479580c597fea6050a545108a8229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:23:43 +00:00
TreeHugger Robot
04cc0c8073
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: Id08264d8b7bc667db110a9f80e2a2831caa0c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:17 +00:00
Hugh Chen
6774dbbe03
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: I0aa9d098c3a69771ff874bc35575a8232128d555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 18:22:14 +00:00
TreeHugger Robot
c8603dabf2
Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev
2022-05-16 17:08:55 +00:00
TreeHugger Robot
7ab31e744a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I71041c5f4ab2f7fed035af85c6c12d11adae03ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:21:46 +00:00
Bill Yi
900e78b59d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I4db5312fb54d53380d583c9563a088f196d99cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:21:30 +00:00
Bill Yi
66ad02c375
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I115c0b84705f3d5b95b9182a747440df07f48fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:21:13 +00:00
TreeHugger Robot
7446f16681
Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599
Change-Id: I9b553601fe759d0593e7c7522c6bb036f6c0afc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 14:15:57 +00:00
TreeHugger Robot
56e3f60dec
Merge "Add the ripple effect to the highlight background" into tm-dev
2022-05-16 13:45:10 +00:00
TreeHugger Robot
12a30b9511
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-16 13:35:19 +00:00
Arc Wang
3975972483
Fix Settings crash when setting a null ringtone am: ec3ae8bb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413
Change-Id: Ibfcbed93b2aeb2d5291b4fd78da3e8092b533430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 10:50:44 +00:00
Jason Chiu
0c5772fdc4
Add the ripple effect to the highlight background
...
Bug: 215267159
Test: visual
Change-Id: I96359342f0b8d40f5cd8dfbe8f1dd8b7d7f1c69b
2022-05-16 18:33:36 +08:00
TreeHugger Robot
bcd32c74c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-16 07:38:50 +00:00
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
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
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
44aab7c55f
Merge "Refine the homepage app bar layout" into tm-dev
2022-05-16 02:01:20 +00:00
Bill Yi
d941a36042
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72edb933db44f747ddd3c5c88e5e3569cd3aa292
2022-05-15 10:28:30 -07:00
Bill Yi
1c8b7a9fe8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I84adbff328986322454db3a886462ebdbbfaf648
2022-05-15 10:24:59 -07: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
6aadac2448
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5d3a009cbf24589f47133461c8f6b375bb7e98c2
2022-05-15 08:26:30 -07: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
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
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
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
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
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
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
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
TreeHugger Robot
69f35acf8b
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: Ifeb20badc063d6f8d38ad3b7c3f613e9fccf3aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-13 15:42:14 +00:00
TreeHugger Robot
8a823a2c2c
Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev
2022-05-13 15:34:48 +00:00
TreeHugger Robot
fa7b40c5da
Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143
Change-Id: I33d03c453fb069211de01c96f9c2f42e29ba59c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-13 14:18:52 +00:00
TreeHugger Robot
cd2d6f3e25
Merge "Add refresh broadcast id checks" into tm-dev
2022-05-13 14:18:44 +00:00
SongFerng Wang
2b6996c687
Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev am: 8492dbb081
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349647
Change-Id: I997dbd1a78b888bce42e03582cd47ee2f4e4faf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-13 14:18:42 +00:00