PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,888 Commits 1 Branch 0 Tags
bfe417ee13c298a79bde2bc274a95a562311778f
Commit Graph

91888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4228fc731e [automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee -s ours am: dece925261 -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: I04578279fe1e9262b9000e2652265771d88bee92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:11:58 +00:00
Peter Wang
35099dc4a5 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours am: 5ee56fb6f8 -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: Ie2574129cd6603bf90d7ffdd32e302b3c8abf79f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:11:56 +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
Joe Bolinger
200707c7cd [automerge] Set exported flag to false. 2p: 34704f4108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Bug: 222684510
Change-Id: Ieb28cc08edd9027734c4ed40e0fe083b50360964
 2022-03-24 18:31:09 +00:00
Joe Bolinger
34704f4108 Set exported flag to false. 
It was set to true when the attribute became required in I878adb9108c95f06ddd059b23a542b61210edfa4

Bug: 222684510
Test: manual (see bug)
Change-Id: I8f67a5c3ac92f4813dc503cada8888833d7dbfbf
 2022-03-24 18:31:01 +00:00
Bill Yi
21377c29a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 752d4d5d72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b29a66c010bf94a5d2aeb1921948231f3283d81
 2022-03-24 15:48:04 +00:00
Bill Yi
d96b66598b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0763fa2379eb008db7ff39ba8bd781b0fcc18f2
 2022-03-24 15:47:57 +00:00
Bill Yi
752d4d5d72 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-24 15:30:38 +00:00
Bill Yi
e2bd7d9886 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie196fdd648f8d7e1df21cd7323aa851d164db6c2
 2022-03-23 18:22:15 +00:00
Bill Yi
5a15b32995 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac 
Blank merge reason: commit message contains skip directive

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

Change-Id: I3a298ec797195f9f7240b4c51c26657d91f4e764
 2022-03-23 18:09:34 +00:00
Bill Yi
a2aacc0aac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifea2ae405190a88de4e795fd91ec426f7cea3be5
 2022-03-23 18:09:25 +00:00
Gary Jian
24888461da Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
 2022-03-23 06:34:55 +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
eefaf62ba7 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: Iabc7d3cf66470bd96c2b5caac2469eac888b2ae2
 2022-03-23 02:34:07 +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
b79a82260c Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
 2022-03-22 17:47:03 +00: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
1b29155aa3 Merge "Do not allow editing of mcc, mnc for carrier id APNs" am: dbe7baa084 am: 27dbc6ed2a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2005870

Change-Id: Ia5c57252e2c6eba348b5ad89e63c49cd03e8e9d3
 2022-03-22 06:05:20 +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
18f403141b Merge "API Review: factoryReset->clearBluetooth" am: 7c099faff6 am: 8139455374 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028623

Change-Id: Ia6a29c6c299aff76a4e1fc2ef58880e2ef76969c
 2022-03-21 17:20:58 +00: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
2054adddf7 Merge "Add i18n team to localepicker OWNER" am: 21eebdce59 am: 7ccb003e9a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033623

Change-Id: Icb64ffcf05c2fb20297a48f09ad09ecf7ca5468a
 2022-03-21 08:29:16 +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
3378f6e4da Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I4d509aab5b501b432bdd6789827945508c7468f0
 2022-03-21 06:25:46 +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
bbb9db4149 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ie97da8acc7f25ae088d9ef36932aeb93be30b7cd
 2022-03-18 23:11:21 +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
Bill Yi
75cce69c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02a68c6262293bdcf21ec90dc7a96ac187041479
 2022-03-18 02:50:07 +00:00