Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,849 Commits 1 Branch 0 Tags
ec1b6c308aa95370cb7d2b3b3784ea72da52e444
Commit Graph

90849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
ec1b6c308a Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: Ib5462706a20ca6565144faae9c5009939bf2eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:28:28 +00:00
Weng Su
c68e241fa6 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" 2022-04-01 08:08:51 +00:00
Treehugger Robot
a1a5091f12 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: I854bc6abd439b952f15627ea1859176c4b0665aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 07:13:19 +00:00
Treehugger Robot
0159ca5d9c Merge "Settings: Fix cellular internet option Not seen after internet reset" 2022-04-01 06:52:44 +00:00
Treehugger Robot
3531a34760 Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409

Change-Id: Id3a72177089ca58c1e8e092220835dd3e5f41064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 01:44:08 +00:00
Treehugger Robot
f558fc27d9 Merge "Settings: Fix WifiSettings FC when rotating screen" 2022-04-01 01:23:47 +00:00
hoffc
0991b39ed3 Settings: Fix NPE FC when access saved wifi p2p device after screen rotation 
Rotating screen, wifi p2p setting fragement will be re-created and the selected wifi p2p device will be saved in onSaveInstanceState. However, now this saved wifi p2p device is restored in onActivityCreated, this is too late. So when getting this saved wifi p2p device return NULL in onCreateDialog and leads to NPE force close.

Restore the saved wifi p2p device in onCreateView instead of onActivityCreated.

Bug: 220025725
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Change-Id: I9b746e21f7f3651c69b1445f2389c089ec19319c
 2022-03-31 06:52:37 +00:00
hoffc
5710b02972 Settings: Fix cellular internet option Not seen after internet reset 
Cellular internet preference will be hidden during reset internet, and resume to be visible after successfully reset or reset timeout. Due to the wrong immediately param value assigned for hidePreference method, which results in cellular internet preference not seen after internet reset.

Assign correct immediately param value when resuming after internet reset.

Bug: 224893326
Test: manual test
atest InternetResetHelperTest

Change-Id: I3f8d5dd9de2a56ecfe201483ee8a95b379e8fe65
 2022-03-31 04:01:58 +00:00
hoffc
f3fe5cf197 Settings: Fix WifiSettings FC when rotating screen 
Rotating screen will trigger wifisettings re-creation. Force close occurs If receiving wifi picker tracker callback during activity finishing.

Bug: 218411211
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I06d251a8a12d3f8785db24ead0abe31c0f34cc9b
 2022-03-31 04:00:52 +00:00
Treehugger Robot
178ba3e57d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9969ee7d5bb026824736ebbba3c43c18f2343e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:45:52 +00:00
Bill Yi
5f55cb2ed8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I765e946f2e8e04370891f50fa42bcde6fe424c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:45:51 +00:00
Treehugger Robot
3ad321509f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie231da55ce887649cc28e0fec042b24b109d9379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:43:36 +00:00
Bill Yi
b28c27e68e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I031a74875cddf5b00bebfbf1d23b5afc9c1fe7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:43:25 +00:00
TreeHugger Robot
97539de67e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-03-28 06:27:30 +00:00
Treehugger Robot
d35c876857 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-28 06:24:36 +00:00
Treehugger Robot
65c7ff0276 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-28 06:23:23 +00:00
TreeHugger Robot
4d9878828e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-03-28 06:20:17 +00:00
Peter Wang
0ab2226dff Add a cancel string for ToggleSubscriptionDialog to handle Tamil 
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
(cherry picked from commit 6879183335)
 2022-03-28 05:21:36 +00:00
Sarah Chin
9b9c5f2f93 Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: I66f96ad433720d92b3c8b0906c4fca1409d281ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 05:11:25 +00:00
Sarah Chin
1abef7542a Merge "[MEP] Use switchToSub API with pending intent" 2022-03-28 04:58:54 +00:00
SongFerng Wang
b9cd3f7ef9 Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028

Change-Id: I473db94863284e07184f90f6f442d3d405c87e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:46 +00:00
SongFerngWang
04424bbf69 [MEP] renew the sim confirm dialog UI am: ba9d26696b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027

Change-Id: I8a21b5f42cdd0febc75d2b4fca211bb21d8ea084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:05:45 +00:00
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
31c40b00e7 Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... 
* changes:
  [MEP] disable enabled esim profile before set simSlotMapping
  [MEP] renew the sim confirm dialog UI
  [MEP] renew the default data selection UI
  switch SIM refactor to support MEP
  switch SIM refactor to support MEP
  Support RTL mode in Sim switch dialog
 2022-03-27 14:44:48 +00:00
Bill Yi
62dc714628 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3193111a9c76984dfdf2310f67908ebed6a203b5
 2022-03-27 04:11:37 +00:00
Bill Yi
38de1eab21 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4726fdf933dfe2ae0f53a7f105925a42e5ce6909
 2022-03-27 04:07:52 +00:00
Bill Yi
9e58dde841 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iace08c34ff96cd8eca6a9fdb99be5a3cc61bde27
 2022-03-27 00:00:55 +00:00
Bill Yi
e4b50ee2d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifb7ddd4639b4f9042ea3d04ce7f3175d3e7a4a85
 2022-03-26 23:57:15 +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
cd6c83ac8d [MEP] Use switchToSub API with pending intent 
It is based on the framework refactor. ag/16494924  Framework
changed the API, so here modifies it.

Bug: 205504646
Test: WIP manual
Change-Id: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
Merged-In: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
 2022-03-25 17:04:42 +00:00
SongFerngWang
eaec059551 [MEP] disable enabled esim profile before set simSlotMapping 
This is the modem request to disable enabled esim profile before
set simSlotMapping.
Since the framework still do API refactor ag/16494924. The
switchToSub API will be changed, so here modify two callback.
the one of callback will be removed after the framework complete
the API refactor.

Bug: 210063749
Test: Build pass. Local test: do sim switch in SS mode and DSDS mode.
Change-Id: Iee650897b81c96b5febb0413649629b1a1971b18
Merged-In: Iee650897b81c96b5febb0413649629b1a1971b18
 2022-03-25 17:04:33 +00:00
SongFerngWang
ba9d26696b [MEP] renew the sim confirm dialog UI 
- renew the sim confirm dialog

Bug: 199902896
Test: build pass and local UI test
Change-Id: Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20
Merged-In: Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20
 2022-03-25 17:04:24 +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