Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,182 Commits 1 Branch 0 Tags
2135db2eacd0c69679ba4b346256d4c7af5d5221
Commit Graph

86182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alice Kuo
2135db2eac Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
 2021-11-29 02:48:43 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
 2021-11-29 02:29:27 +00:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device 
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
 2021-11-26 13:13:25 +08:00
Treehugger Robot
d36b37ab1c Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I8ed9aa66573560824dac6c09295effecd7ee190d
 2021-11-25 11:14:15 +00:00
Treehugger Robot
90a326dc3c Merge "Hide emergency APN in user settings" am: 6c553c0c5c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: Id5f63157fc108b45a23a9a07572b719053945b7c
 2021-11-25 10:57:05 +00:00
Treehugger Robot
6c553c0c5c Merge "Hide emergency APN in user settings" 2021-11-25 09:58:12 +00:00
Mattias Nilsson
6a56b4a8e6 Hide emergency APN in user settings 
Emergency APN types is not something for the end user
and should not be possible to edit.

Test: Add an emergency APN and check in Settings
Bug: 207626003
Change-Id: I866eb98dce410218bc76ade3201a2a2abfc959e7
 2021-11-24 16:43:42 +01:00
Jack Yu
3ccf7e29f8 Merge "NFC support in work profile" am: c2647199ce am: 79675e89f2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: I6526b8a3f83c72870a93777d37242f1fb191568f
 2021-11-22 11:12:20 +00:00
Jack Yu
79675e89f2 Merge "NFC support in work profile" am: c2647199ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: Iac30f77fd5d732bb3b50fc531600fed02d477919
 2021-11-22 11:00:16 +00:00
Jack Yu
c2647199ce Merge "NFC support in work profile" 2021-11-22 10:45:44 +00:00
Xin Li
69e79704e3 [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d43 -s ours 
am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f9214763 is already in history

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

Change-Id: Ibb132379ab32739f0c9bdc29ded3159775eb884e
 2021-11-18 22:00:58 +00:00
TreeHugger Robot
062c92d459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idad6caf7532b3c1d08bf007708bb05a0212c95e7
 2021-11-18 19:22:43 +00:00
TreeHugger Robot
026f820cce Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832

Change-Id: I085605b91279dd2ff342a5e79b613ee3a35ac43a
 2021-11-18 19:22:38 +00:00
Bill Yi
c4894489f5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 am: 61505e7824 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6849598109a72f67c61be1f614e162cf9de38f9d
 2021-11-18 19:22:36 +00:00
TreeHugger Robot
9adb10d6fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47c73fbaece5fa90f127335d93cf439b7ec9e720
 2021-11-18 19:22:29 +00:00
TreeHugger Robot
6cae0edae1 Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 19:06:29 +00:00
TreeHugger Robot
ebd2e1f662 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-18 19:06:29 +00:00
TreeHugger Robot
db6bdc35f2 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: I25e1e2e362a458362025d435667133d37621dd02
 2021-11-18 18:08:20 +00:00
Bill Yi
931145f30e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5da598d10ce0cf7df291b92b5965363eb878b42
 2021-11-18 18:08:17 +00:00
TreeHugger Robot
1ed1be15d8 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 17:51:48 +00:00
TreeHugger Robot
6e7435398e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabd4701965c8f88c200a616310481fd330114671
 2021-11-18 17:02:48 +00:00
TreeHugger Robot
0b17afd619 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia12ac51a8a17c860a38f10da88ed70a73928394b
 2021-11-18 17:02:38 +00:00
TreeHugger Robot
fda2135c78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-18 16:57:43 +00:00
TreeHugger Robot
277f726266 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-18 16:49:54 +00:00
Bill Yi
2c292c3bd0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1374d712733e84b14c7e8d7a030e5a2925e8fa7d
 2021-11-18 11:14:31 +00:00
Bill Yi
61505e7824 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1ba27aa6206d0f3397fa2368b2e0a7aee2872242
 2021-11-18 11:11:02 +00:00
Bill Yi
10928bfba9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic2a76b26c01ac12d38805cfe0e587bc6578cb031
 2021-11-18 11:10:53 +00:00
Bill Yi
c3da08f9b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14e8407dfd64beac27fc43769f7009427f477027
 2021-11-18 11:01:28 +00:00
Bill Yi
d86da91c3e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1988d2aea846cc00ec8929d7e898f821a686c5cc
 2021-11-18 11:00:03 +00:00
Bill Yi
b8b0bef8f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
 2021-11-18 10:59:55 +00:00
ykhung
3c1da6b2af Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
 2021-11-17 14:19:22 +00:00
ykhung
13a52a081e Update "Mobile network standby" attribute label into "Mobile network" 
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7)
 2021-11-17 12:35:23 +00:00
TreeHugger Robot
0bbf5438d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I356b281608f37db8d3683a20840bd274e4c5f26d
 2021-11-16 06:57:13 +00:00
TreeHugger Robot
ed43498d71 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id969ace896b3a93fc3b3f60a442b65fa445f2a2c
 2021-11-16 06:56:52 +00:00
Bill Yi
1ab9266897 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If64647c33ee377a6bd91099bc6fc81c33ecb9dba
 2021-11-16 06:56:50 +00:00
TreeHugger Robot
868cb753cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55e9911e89da1f596826b485f21db1b943a60b35
 2021-11-16 06:56:46 +00:00
TreeHugger Robot
36ae9f88a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:45:14 +00:00
TreeHugger Robot
0bbc6e224f Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 06:45:14 +00:00
Bill Yi
c2cdc020d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5eed8d41e7b9311f91bcf841f01e379e4904f29
 2021-11-15 17:16:23 +00:00
TreeHugger Robot
b7cb455366 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd94029e31ce22b03f792016670a89110adf3981
 2021-11-15 17:15:37 +00:00
Bill Yi
73bedcdd7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e8f62e50556e57371cddbcb7be02f75e0630cda
 2021-11-15 17:15:08 +00:00
Bill Yi
16e6040e59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75567b65694e64a0a3c663d2b7a59e63f63e0746
 2021-11-15 17:15:02 +00:00
TreeHugger Robot
db01149e40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-15 17:00:27 +00:00
Jack Yu
2a2e0275cc NFC support in work profile 
Configure NFC payment settings based on userId.

Bug: 202367033
Test: mauanl tests
Change-Id: I97e275f374d34618b64188d5de185ec6c527e0fd
 2021-11-15 19:03:34 +08:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
 2021-11-11 16:54:23 +00:00
Bill Yi
c91c41405c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ac727134512d558c3d0856b1aadfa1e998bfcf9
 2021-11-10 18:51:11 +00:00
Bill Yi
b9dbf91cc7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I70122c3010dc24d428cba88efb50b95275ee635a
 2021-11-10 18:47:20 +00:00
Bill Yi
1c6dddd1f0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a07f66a40b073e21a143722639117320ac113b5
 2021-11-10 18:37:33 +00:00
Bill Yi
1246b8bc86 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e 
Blank merge reason: commit message contains skip directive

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

Change-Id: I612ad1b35d17933063a2d083bccf762b222a8273
 2021-11-10 18:36:05 +00:00
Bill Yi
b546c8aa3e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6739a3e0bbf088d750f5b1e52e5dd0f82bcf2be4
 2021-11-10 18:35:55 +00:00