Commit Graph

90819 Commits

Author SHA1 Message Date
SongFerngWang
e9d39b468d [MEP] renew the default data selection UI am: db2ddb6a92
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026

Change-Id: I8854b721cc74a33071abaa2ff76a8e3428174c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27 15:05:44 +00:00
SongFerngWang
b29d670c71 switch SIM refactor to support MEP am: 59a6ecbde2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025

Change-Id: I5747bf7dec160d081f4cb2c69f60173c9d4dd6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27 15:05:42 +00:00
SongFerngWang
483ff27a47 switch SIM refactor to support MEP am: 37358798bc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024

Change-Id: I9ede4062566e48899eb79ff12e5e4cd96b01ddba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27 15:05:41 +00:00
changbetty
342fe3487e Support RTL mode in Sim switch dialog am: 562cc5ed45
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023

Change-Id: I67e4a9aa874b0a103c5c06863d42826f8f0a3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-27 15:05:40 +00:00
SongFerng Wang
8030d66e0d [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: I83bf260cf7a13e430d05ff0bdd853d039f14db61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:05:46 +00:00
Peter Wang
810677e214 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada is already in history

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

Change-Id: I3ed72e07a176e34346d59459f0099f165389e34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:05:45 +00:00
SongFerng Wang
5dea8d562f [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030

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

Change-Id: I04b09953f289daa0f1c523577baecfa186753329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:04:53 +00:00
SongFerng Wang
9c1f66d741 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030

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

Change-Id: I646ffb450b7d74774ce1d2c322006521efd80593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:04:50 +00:00
SongFerngWang
db2ddb6a92 [MEP] renew the default data selection UI
- renew the default Data/Call/SMS selection

Bug: 199902896
Test: build pass and local UI test
Change-Id: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
Merged-In: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
2022-03-25 17:04:15 +00:00
SongFerngWang
59a6ecbde2 switch SIM refactor to support MEP
To create new dialog for MEP. It is a simple UI for testing,
not the final version.

Bug: 199902896
Test: local build pass.
Change-Id: Ief4299e775c0758e4b886d5eff13bd482f8c8ab3
Merged-In: Ief4299e775c0758e4b886d5eff13bd482f8c8ab3
2022-03-25 17:04:04 +00:00
SongFerngWang
37358798bc switch SIM refactor to support MEP
1. Using new telephony API and doing the code refactor
2. To support multi esim profiles case

Bug: 199902896
Test: local build pass.
Change-Id: I8580022793e5c3fc14159f14b406f864353477f8
Merged-In: I8580022793e5c3fc14159f14b406f864353477f8
2022-03-25 17:03:55 +00:00
changbetty
562cc5ed45 Support RTL mode in Sim switch dialog
Screenshot: https://photos.app.goo.gl/QuDrFzBSzog1F7Gf7

Bug: 189955098
Test: Manual Test
Change-Id: I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a
Merged-In: I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a
2022-03-25 17:03:25 +00:00
SongFerng Wang
7ba3e20afb Merge "Add a cancel string for the dialog to handle Tamil translation" 2022-03-25 17:02:53 +00:00
Peter Wang
aa042c2d6c Add a cancel string for the dialog to handle Tamil translation
Bug: 185553806
Test: Build
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Change-Id: Ie8e9d150bf7868b462176c5cb5ed65beb187cc0e
2022-03-25 23:54:22 +08:00
SongFerng Wang
02db0438a9 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" 2022-03-25 15:34:32 +00:00
SongFerng Wang
0f77d567b4 Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"
This reverts commit 9ecda98ada.

Reason for revert: It should not add"Merged-In: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9", so do revert and CP it again.

Change-Id: I6c62e2a02e62f16c45771daee5040753ab14a4b8
2022-03-25 14:03:29 +00:00
SongFerng Wang
dece925261 [automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee -s ours
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I9484599eba7ddacad002343cd22a9476afecff3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 09:47:29 +00:00
Peter Wang
5ee56fb6f8 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history

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

Change-Id: I160a5eeac58e392bb9eaabc9831354c79fca21e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 09:47:28 +00:00
SongFerng Wang
d71406f8ee Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" 2022-03-25 09:28:56 +00:00
Peter Wang
9ecda98ada Add a cancel string for ToggleSubscriptionDialog to handle Tamil
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
2022-03-25 00:41:05 +00:00
Gary Jian
41ec2bc89b Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Ia08609cddc63034e3f9d02f64727d92fe9e2348f
2022-03-23 06:11:41 +00:00
Gary Jian
78b2b241a9 Merge "Add a developer option to controll mockmodemservice permission" 2022-03-23 05:46:22 +00:00
SongFerng Wang
285952a80e Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
2022-03-23 02:11:19 +00:00
SongFerng Wang
75869b5fef Merge "[LE adudio] The condition of right location is wrong." 2022-03-23 01:52:05 +00:00
SongFerngWang
418d78f978 [LE adudio] The condition of right location is wrong.
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.

Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
2022-03-23 02:55:06 +08:00
Eric Biggers
465363a312 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b
2022-03-22 17:46:14 +00:00
Eric Biggers
d106ae0f82 Merge "Remove EXTRA_KEY_TYPE intent data" 2022-03-22 17:37:33 +00:00
Chen Xu
27dbc6ed2a Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: I10a5f94e302ef87490c2d4daa327a2207698de48
2022-03-22 05:50:29 +00:00
Chen Xu
dbe7baa084 Merge "Do not allow editing of mcc, mnc for carrier id APNs" 2022-03-22 05:34:21 +00:00
Gary Jian
5a535e6674 Add a developer option to controll mockmodemservice permission
Bug: 220995034
Test: 1.enable/disable from developer option and check the property value
      2.atest MockModemPreferenceControllerTest

Change-Id: Iaa1a29f4214e1208fe4de497ff4b05c47c34b266
2022-03-22 12:02:52 +08:00
William Escande
8139455374 Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623

Change-Id: I06b60f5208f839d42be064fd0ed9fbfc42c57a6e
2022-03-21 17:03:37 +00:00
William Escande
7c099faff6 Merge "API Review: factoryReset->clearBluetooth" 2022-03-21 16:56:32 +00:00
Treehugger Robot
7ccb003e9a Merge "Add i18n team to localepicker OWNER" am: 21eebdce59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: Ief9a16a4cae616181d206d81dc4698bdbbc34b8e
2022-03-21 08:10:31 +00:00
Treehugger Robot
21eebdce59 Merge "Add i18n team to localepicker OWNER" 2022-03-21 07:56:11 +00:00
Treehugger Robot
bcb4ee1e8c Merge "Add LE audio hardware offload development option" am: 3c209b06c0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I1e710f007fc0b0183b9cac41514aaadbf828bcaf
2022-03-21 05:52:37 +00:00
Calvin Pan
1fd5f8ff5c Add i18n team to localepicker OWNER
Change-Id: I5769d5040958b62d9f29f3a802bf06e10a40ea1d
2022-03-21 05:46:10 +00:00
Treehugger Robot
3c209b06c0 Merge "Add LE audio hardware offload development option" 2022-03-21 05:24:10 +00:00
Eric Biggers
1cc85062cf Remove EXTRA_KEY_TYPE intent data
This intent data was only used by CryptKeeperSettings, which has been
removed.  This is also one of the only remaining users of the
StorageManager.CRYPT_TYPE_* constants which were only ever intended to
be used with vold's Full Disk Encryption APIs, which have been removed.

Bug: 208476087
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
      (No regressions seen; 2 tests fail both before and after.)
Change-Id: Id6e2c0f5ecc79f7372b29393e66ffbd66d52d7a2
2022-03-21 05:09:48 +00:00
Treehugger Robot
0b28adfd8e Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: I34c53ca0500252de1245691e403327f470d0e293
2022-03-18 22:55:36 +00:00
Treehugger Robot
2f4962c862 Merge "Add null check for mChannel object in WifiP2Settings" 2022-03-18 22:38:19 +00:00
Yibo Wang
e20ddfa5f4 Add null check for mChannel object in WifiP2Settings
When user switch between settings of hotspot(Enable hotspot),
Internet(Enable Wifi) and Wifi-Direct(establish, disconnect and
forgot P2P connection).

mChannel becomes null during WiFi P2P user scenarios resulting
in Settings(com.android.settings) crash on enable Wifi.

This commit fixes mChannel IllegalArgumentException: Channel
needs to be initialized.

Test: manual test
Bug: 218608961
Change-Id: I72c67bcd1086afe2aa8d2c5521107e2d38e5b0bb
2022-03-18 15:08:51 +01:00
Tsung-Mao Fang
31c02007ef Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I1797a32fe9037755a699c3d402d69d4d557c27c3
2022-03-17 08:14:09 +00:00
Tsung-Mao Fang
19d06e79b9 Merge "Settings: only set phone number if it's not empty" 2022-03-17 07:35:42 +00:00
Mattias Nilsson
aa4ac1e5b9 Do not allow editing of mcc, mnc for carrier id APNs
A user that is allowed to edit mcc, mnc or mvno data can break
the APN list. If a carrier or OEM has added an APN that is
matched with carrier id there is no need to edit those fields.

Apn Editor should not throw any error when a user backs out of
from a carrier id APN where mcc, mnc is empty.

Disable editing of these fields and check for carrier id APN
before adding error message.

Test: Add carrier APN, insert sim and back out from ApnEditor
Bug: 222103038
Change-Id: I4e86cdd3e8caaf3dbfefe9b9f82f11c2804577ff
2022-03-17 06:54:08 +00:00
SongFerng Wang
704147041b Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: I639df2d59da6f2793bec3c89751523778f7cf35b
2022-03-17 03:52:28 +00:00
SongFerng Wang
8ca446a175 Merge "Add the battery information into device details header" am: 907b3fc4be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Id78a0d42672ff4109449951f755ac68f169dab6b
2022-03-17 03:51:56 +00:00
SongFerng Wang
cfb201c400 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" 2022-03-17 03:11:24 +00:00
SongFerng Wang
907b3fc4be Merge "Add the battery information into device details header" 2022-03-17 03:11:20 +00:00
Eric Biggers
629db5f9f8 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: Ic08831f723e777c150a672924616184af0d3299f
2022-03-16 18:34:10 +00:00
Eric Biggers
804dc16a03 Merge "Remove support for converting from FDE to FBE" 2022-03-16 18:10:30 +00:00