PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,878 Commits 1 Branch 0 Tags
d24f4a3f54573a2b2562c6f98a6fb0d73c40612c
Commit Graph

103878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Kremp
b16ac39ee1 Keep setting of "TurnOff hotspot automatically" when AP is changed 
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.

Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com>

Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
 2022-06-15 09:20:18 +02:00
TreeHugger Robot
d61b92219c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23832d4722bd717e48189823e8557ba268ec797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:59 +00:00
Bill Yi
46611a953c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5d75ff189ee4beac391c7978d4a313868e9aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:42 +00:00
TreeHugger Robot
50a74572fc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-15 05:25:34 +00:00
Xin Li
d6c80bd8e3 Merge Android 12 QPR 3 
Bug: 236045730
Merged-In: Ie1e14a6b697af624854a9360a60383fac63bb02c
Change-Id: Ib7885655035baa9aa6add39f7a169f7c84d48138
 2022-06-14 16:48:16 -07:00
Jason Parks
4a9c108b28 Use API to check for the superivion component. 
Bug: 219025233
Test: manual
Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1
 2022-06-14 17:16:07 +00:00
SongFerng Wang
95f153642c Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I2ed62ef98c1e81d6549ba1eb0c271ef3bf61d168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:08 +00:00
SongFerngWang
a5ddd89091 [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours 
am skip reason: Merged-In Ibd324b781c84318c994e3742bb82e1d1393b94e4 with SHA-1 64430ba2d2 is already in history

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

Change-Id: I99165f11aac03bbca7ecc3af80fe669a90cb098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:07 +00:00
SongFerngWang
e74c1c4204 [automerger skipped] Reuse the active esim slot am: 887bb592c8 am: da2d1d85aa -s ours 
am skip reason: Merged-In I6daa38f54abfaf67c7640d9dc8be0da02eb59554 with SHA-1 42aa247383 is already in history

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

Change-Id: I853b143264b8b796018517858db1b121b050aec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:05 +00:00
SongFerngWang
82fb3dc1f5 [automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b am: 886193184d -s ours 
am skip reason: Merged-In I242402e49b267c8cd61a85a46367c778d2d8bbf8 with SHA-1 c389149ff3 is already in history

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

Change-Id: I6540061086c8275648ee105db0664ecad8944931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:01 +00:00
SongFerng Wang
a5a729f523 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: Ie1e14a6b697af624854a9360a60383fac63bb02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:22 +00:00
SongFerngWang
fbfaa331d2 Unable to enable the removable esim am: 56e1297abe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195

Change-Id: I02f2599c790c90a0b602b84bc8b511f521a7e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:21 +00:00
SongFerngWang
da2d1d85aa Reuse the active esim slot am: 887bb592c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194

Change-Id: I273a609f8f615c9e74fbf416c859b5159ca420c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:20 +00:00
SongFerngWang
886193184d stop show preferred SIM card dialog during sim switch am: faf9baf95b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121193

Change-Id: I3222b73bf7e01f30a56ba53cba04ed6cba45a608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:17 +00:00
SongFerng Wang
8be3ebd163 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 
* changes:
  [MEP] Modify the comments
  Unable to enable the removable esim
  Reuse the active esim slot
  stop show preferred SIM card dialog during sim switch
 2022-06-14 06:34:07 +00:00
TreeHugger Robot
36c472970e Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I0250905df7b4fca60115d7a2fd837e122efbae44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 03:25:27 +00:00
TreeHugger Robot
c45731efdb Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev 2022-06-14 03:01:18 +00:00
Jason Chiu
27c6b55ac5 Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link 
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.

Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.

Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
 2022-06-14 02:45:49 +00:00
Bill Yi
f68acfb73e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18a9ac4db3be35e4b643a213c8635b1b22a2bec8
 2022-06-13 16:26:38 -07:00
Gil Cukierman
ad8685a28e Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772

Change-Id: I52b1fba91b6d25b5b02d94d9ae3fd9cf307cb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 20:16:03 +00:00
Gil Cukierman
fecd7c1c1a Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772

Change-Id: I6ceccc283e4065fb94b2cf0c741905be40b31c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 19:48:40 +00:00
Gil Cukierman
778d851165 Merge "Improve documentation of Enable2gPreferenceController" 2022-06-13 19:03:49 +00:00
TreeHugger Robot
62a0ea69e3 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I5a82edaa021f62b910267ff6f7da5fda43453031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 18:29:37 +00:00
TreeHugger Robot
e058aae3cd Merge "Add "smallestScreenSize" into homepage activities" into tm-dev 2022-06-13 18:11:22 +00:00
TreeHugger Robot
3ecbe9bc0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib80b1d4f968a8275bc8c92aede6c84f8aa7ab523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:32:34 +00:00
Bill Yi
ae5b4b8105 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe20bf626167e701d69bb9b57eb6fa1a42fb1270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:32:19 +00:00
Bill Yi
b0b7c615bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfd46c1623530d3384f10c41bd4a19f4817a75e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:32:04 +00:00
TreeHugger Robot
e5a507e23c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 17:04:36 +00:00
Bill Yi
fbf554e66e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94c794e5c7065d881be7d7888f4223fd5fdf0491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 16:54:19 +00:00
TreeHugger Robot
2614629a50 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-06-13 16:44:24 +00:00
TreeHugger Robot
8122edc9ac Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:03 +00:00
Bonian Chen
03da62810c [Settings] Avoid from close dialog when touch outside. 
Roaming confirmation dialog might get closed when touch outside,
which is easily been triggered when having a large screen.

Solution: avoid from close dialog when touch outside of dialog area.

Bug: 235183999
Test: local
Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358
 2022-06-13 20:55:32 +08:00
SongFerngWang
e63dfcbd90 [MEP] Modify the comments 
Bug: 235792308
Test: build pass
Change-Id: Idf0ce19814ce8b23bc1eea864b36815203069f87
 2022-06-13 18:24:30 +08:00
SongFerngWang
56e1297abe Unable to enable the removable esim 
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
 2022-06-13 17:49:00 +08:00
SongFerngWang
887bb592c8 Reuse the active esim slot 
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.

Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
Merged-In: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
 2022-06-13 17:48:34 +08:00
SongFerngWang
faf9baf95b stop show preferred SIM card dialog during sim switch 
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
Merged-In: I242402e49b267c8cd61a85a46367c778d2d8bbf8
 2022-06-13 17:48:24 +08:00
Jason Chiu
ae1c17bd0f Add "smallestScreenSize" into homepage activities 
The Settings home activity was initially launched in full-screen size,
and then resized in order to be displayed with another placeholder
activity size-by-side.

After ag/18668447, the smallest screen width dp configuration of the
activity was changed to half of the screen size (vs. the fullscreen
size) while embedding.

Therefore, the system updates the configuration changes using
CONFIG_SMALLEST_SCREEN_SIZE, which the Settings home activities didn't
declared. This makes Settings show the full-screen home layout in
dual-pane mode.

Fix: 235449822
Test: visual, robotest
Change-Id: I801ff5fb20b2a42c94223a6edd4af08b67e7f4e9
 2022-06-13 06:44:22 +00:00
Bill Yi
e006e9823d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
 2022-06-11 13:17:41 -07:00
Bill Yi
5154fc5c35 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3654d12018957304a0bd3064d9950d284baaf332
 2022-06-11 12:55:04 -07:00
Bill Yi
0157713d52 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8e4f48ee4f355af084d6a0edcb2d4172246a4a87
 2022-06-11 12:49:13 -07:00
Bill Yi
154b913f4b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
 2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
 2022-06-10 21:43:26 -07:00
TreeHugger Robot
45580a02a4 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Ic7f0628f3ef18ee92733fee88e21242a1424c62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 20:37:28 +00:00
TreeHugger Robot
1c45e9ad72 Merge "Update fingerprint removal dialog strings" into tm-dev 2022-06-10 20:09:03 +00:00
TreeHugger Robot
f7b4e4adc9 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I6c28e8ad8fc8e97cf1f6c5c290562f7b6dda4821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 18:54:24 +00:00
TreeHugger Robot
fc45c25296 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev 2022-06-10 17:25:25 +00:00
Joshua Mccloskey
06b76edbb7 Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:27:59 +00:00
Joshua Mccloskey
75313dcb5d Merge "Updated FP enroll confirmation string" into tm-dev 2022-06-10 16:05:31 +00:00