Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,081 Commits 1 Branch 0 Tags
6fcdbbeac5ab262cc6ed511fe4ef1b210cf11b34
Commit Graph

92081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
6fcdbbeac5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccbbd4929788c7a64c6b3aeb9a318684054eb07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 21:29:09 +00:00
Bill Yi
9896cc4089 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f8f3afe70d6fddf885a37b9ba3cae0946d7d692
 2022-04-20 03:47:49 +00:00
Bill Yi
c88b882013 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I647d7ed44ee15b1c55ae97993b5c15ab16157438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:46:10 +00:00
Bill Yi
5e99e584f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8c3416a031f791d4e4603c39aea24932c835360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:46:08 +00:00
Bill Yi
9d597ae5b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f6767d2a7e0cadb67eb58cb0464880acfbcc6e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:45:44 +00:00
Bill Yi
052970997d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-19 00:27:54 +00:00
Xin Li
024fe4b39a [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ia9158c51f249227851e314b45566de1f7bfec848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:08:18 +00:00
Xin Li
99d834b0b8 Merge sc-v2-dev-plus-aosp-without-vendor@8433047 
Bug: 226662282
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I71459583120f712298f47b4dbd2c791d8ef4e022
 2022-04-18 21:01:08 +00:00
Bill Yi
64a0937f54 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7d7f009e6a1f4698d7d302ce3440b60f679e672
 2022-04-18 10:57:25 +00:00
Bill Yi
442f62eb55 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I69867d36d9dfef29de295def3477ccd9222b24da
 2022-04-18 10:42:59 +00:00
SongFerng Wang
6296df10da Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Ib36f32c745b571d18e09e2a5f5ae81220e441fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 08:22:54 +00:00
SongFerng Wang
3b66c18d75 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Ie05c32e8c7d358d4cfad14cee4dc5f8849384d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 08:06:58 +00:00
SongFerng Wang
48967e6466 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" 2022-04-15 07:23:39 +00:00
SongFerngWang
b50430e09d [LE unicast] Change the default value for LeContactSharingEnabled 
Bug: 229322144
Test: build pass.
Change-Id: I7673397b9f04df8acb551bdad42dea1f3ece72ff
 2022-04-15 15:19:17 +08:00
TreeHugger Robot
d22b43c6a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8d08684f79433ec17dfad8daf29de4e23b28eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:26 +00:00
Bill Yi
812e79c8cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic507bfd58ddae3eef0b30505327b18ceac24e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:24 +00:00
TreeHugger Robot
c53da610b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3fcaae0791677a5244d0006375b38f09847194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:15 +00:00
Bill Yi
57b6374513 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a89457b55725eb781c4106d2a15ee53a15d7dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:01 +00:00
TreeHugger Robot
940c2d25fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:57 +00:00
TreeHugger Robot
b299745a6c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:54 +00:00
SongFerng Wang
9d10f0a9fb Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409

Change-Id: If1486cddb0887de41eef67dcdb04fe385261cbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:37 +00:00
SongFerngWang
10d36c9800 In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408

Change-Id: I754af5b8ba51d3cfb73fc894796163209cf8d723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:36 +00:00
SongFerngWang
bca382eefb [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407

Change-Id: I88fe8f02e2cfc1d65a2626290b747cc454958819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:35 +00:00
SongFerngWang
ffdf3513ec [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566

Change-Id: I0f664206c950dae9204f36f1a28f1c63112b9bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:34 +00:00
SongFerngWang
d65110a8ff Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565

Change-Id: Id6de8ec6e269fc6720c57ee04bd2e26d90293ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:32 +00:00
SongFerngWang
56f8390f6e [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564

Change-Id: I5ec77b0842dd250095adbb1cc063ec9d9e656a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:31 +00:00
SongFerngWang
b8a9355134 [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563

Change-Id: I64b9af4dca993a57954ef9163f5fa1dd5bd6da89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:30 +00:00
SongFerngWang
f74ef50676 [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562

Change-Id: I3ed592f99798051fc56100e7bbadbf1c0fcc9260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:28 +00:00
SongFerngWang
bb912216d7 [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561

Change-Id: I85831aa726c5a9a7b48d54318a8563fcf37d19ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:27 +00:00
SongFerngWang
4d039eaefc [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560

Change-Id: Ib78e2038d2cb8bc2e9e7bdb78c90bd515f8b306d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:26 +00:00
SongFerngWang
094ba6c077 Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559

Change-Id: I6f19543b5ff79a9dc2d1c7779aea1da8372b573f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:25 +00:00
SongFerngWang
22f38eeacd The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558

Change-Id: Ib1b6efb59ba378841a76eab036a5975e86647082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:24 +00:00
SongFerngWang
d4ca5a289f The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557

Change-Id: Ic6d51241edee333838e7b9d0472dd8267db68794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:22 +00:00
SongFerngWang
de8a16419e Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556

Change-Id: I00831568c5e8f24676fe640ec7f1756d30a41efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:21 +00:00
SongFerng Wang
028ad8fd3d Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555

Change-Id: Ie213f2dbb5ed5c12210d7fe32b32217314f9b9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:56:24 +00:00
SongFerng Wang
459429c182 Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409

Change-Id: I0737e21c4a5939de394c418cb9261a52a3f5df86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:21 +00:00
SongFerngWang
6282d8a5de In E+E, the user can't enable the PSIM am: ccd55cc5c9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408

Change-Id: If0aeb9e68364fc649d0b3877ba4f8bdc0dd9afec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:20 +00:00
SongFerngWang
83311b6208 [MEP] psim's logical slot index is 0 am: 2479c9f7bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407

Change-Id: Id29b82927a35b45ca339abbf3896d7a2e788b426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:19 +00:00
SongFerngWang
6a0742b2fb [MEP] The condition of "null point check" is wrong am: 5c0df6913b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566

Change-Id: I4066d3971802aa77ccdf3e11a67dbbf4a66cc9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:17 +00:00
SongFerngWang
a800c05ac7 Fix the settings crash when SimDialogActivity is null am: d786b64ff6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565

Change-Id: I393f4a56a15b1288a0fa5f0bfd1b9e43101f555f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:16 +00:00
SongFerngWang
bfe417ee13 [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564

Change-Id: I7747af7bcd3406accc607e066a39fb38cada96f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:15 +00:00
SongFerngWang
f80bc78252 [MEP] the port id is wrong am: 9ee91da8e1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563

Change-Id: I439d109e094d572c9bf645e75b46e4eb510d474b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:14 +00:00
SongFerngWang
e0e40b1e88 [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562

Change-Id: I9f5686677f2ee6562e8d5ee64a6aa7db6e78ee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:13 +00:00
SongFerngWang
f54b0ca79f [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561

Change-Id: I9542a089b58595a0e2e528070acbe8c7221ebe34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:11 +00:00
SongFerngWang
f795e9b6d0 [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560

Change-Id: If1d1172fd657eb43510b1672323244317163d1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:10 +00:00
SongFerngWang
2b02a6f3d2 Lost code for setting the list as visible am: 130b739ed1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559

Change-Id: I7e5baa3413178156c144c84e8ebd9db75f9b59de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:09 +00:00
SongFerngWang
a6794dcc8a The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558

Change-Id: I117ed9f34fdf3758525dec30b1364db0a7645bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:08 +00:00
SongFerngWang
c70bde0995 The carrier name is wrong in the dialog am: f513452d4b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557

Change-Id: I3582f4af795152245bcb57b08550e3e994cb0853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:06 +00:00
SongFerngWang
d4b95990e9 Refine the mobile data selection UI am: 964c7d5eaf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556

Change-Id: I6e1add83c0f35569443da12f0f991be7a69f90eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:05 +00:00
SongFerng Wang
1e89cd323e Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555

Change-Id: I517c537db0a1b619f3891f27d798b3741e7c8fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:02:17 +00:00