Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,510 Commits 1 Branch 0 Tags
b1a5167a8db2209df35a28df8e75db35db3e2e20
Commit Graph

103510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Hsu
b1a5167a8d Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I91d7d5fce29f38fa94778b5c84f58e4c87cc5153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:28 +00:00
TreeHugger Robot
132ffcade3 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours am: ce98ad58a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic424d72d84c3a847f1f514ae30cae9264a45caed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:19 +00:00
Hugh Chen
501ff023cb [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours am: 97299b8c00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94b61d42c8365de5ef4efe20ed3e0d83842c7e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:17 +00:00
Hugh Chen
6f866f150b [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: Ieddf63dccdfafead88a6216f4d31f7cef7c33944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:09 +00:00
TreeHugger Robot
db2705999a [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: I3d947d1317301c14daeca8390adf988ecaee092e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:02 +00:00
Hugh Chen
c2da472477 [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: I696f30661049e04ced152785d7d4551f2a7d3986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:26:01 +00:00
TreeHugger Robot
a60e8c0f03 [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: Ie81c1d2094846b33db4ef09e4e4fbdeb6cc915fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:22:03 +00:00
Bill Yi
74bc2e20e4 [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: I5a26d126f265b445dfb89b34b5da388577888f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:21:49 +00:00
Bill Yi
04f012f755 [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: I68ecd2e9381df98fd1d5c5bfce54de06dc38c568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:21:31 +00:00
Bill Yi
4cf0235db1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7ea0147b67f87e26c3007b9bbaea493be06e302
 2022-05-16 21:41:18 -07:00
Tom Hsu
45c60f8564 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev 2022-05-16 18:38:36 +00:00
TreeHugger Robot
ce98ad58a5 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54b9e0292e97a8789653dc1dd8a6bb4e5e444d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 18:31:32 +00:00
Hugh Chen
97299b8c00 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I525120b808c5742122b74c82e971dc315211058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 18:31:30 +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
TreeHugger Robot
e26317b97c [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0999aa18fd2eafee129ec5e22ad5fc4c411d2a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 18:23:52 +00:00
Hugh Chen
e178179a9e [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b5f85e564f46279e0b8413571409ea7d885bc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 18:23:50 +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
20457ad117 Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev 2022-05-16 17:08:57 +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
tom hsu
c5bb55689b [Panlingual] Fix the item clicked is not match target application 
- Remove unnecessary action of shift poistion.

Bug: b/232754527
Test: local and see b/232754527#2
Change-Id: Ief8655661dd3cc468e68a085dede528694ede33c
 2022-05-16 22:42:20 +08: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
472d540799 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: I3909dc2869abf972835d159545f1c3e79360045a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:14:37 +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
7b14f3130c 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: Id020d2d587d7a1ab31a95e809e2e0e5e124f86d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 10:49:42 +00:00
TreeHugger Robot
673ba1d114 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-16 10:44:19 +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
1b69400552 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-16 07:39:30 +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
b0cb78a5e2 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: I18ed5f512597e4b7f29e11ac9d5f83b33032c3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 04:03:37 +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
50c1b40d30 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: Ib766cf7d1a9012cd28354f5731cea1979a1f7d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 03:16:48 +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
3634c0bac5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7d8a52e2dd7b144ff0ab1c40007055a74c6f971e
 2022-05-15 08:20:31 -07:00
Bill Yi
5a8474686f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2771b1d1300d716809ac9e4cc9edce021451fed1
 2022-05-15 08:12:21 -07:00
Jason Hsu
fd94f4b0be 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: I0dbe5e49614397ba3f6ae08f4c71e46392a8103c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-15 09:49:20 +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
99e5fe760a 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: I7d468f4c126349268a33c7d934718c3c59d6895b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-15 06:19:29 +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
73823ec232 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: I5278a256eff5448ca3517ce476cf141b37971b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 01:04:42 +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
76155f90db 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: Ic6376a76ade793411f027056a4032e401811285b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:57:46 +00:00
jasonwshsu
5df43f61d1 Update summary in Accessibility -> Hearing aids am: 82d3bb2b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17298123

Change-Id: If31b7485992c192a4afebd85d30355f811b33fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:57:44 +00:00