PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,382 Commits 1 Branch 0 Tags
28d6d5a7c29a69b61d51e9468cb55ef679b2124c
Commit Graph

104382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android Build Coastguard Worker
b3060929de Snap for 8717000 from e058aae3cd to tm-release 
Change-Id: I97d11ef2cd2ab6a82b9801e6c3c2aec0aa1b2bba
 2022-06-13 23:25:04 +00: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
Android Build Coastguard Worker
46d341901b Snap for 8710048 from 1c45e9ad72 to tm-release 
Change-Id: I7d910e4de46af8b52aef1a1bd67ab6393be05c2d
 2022-06-11 01:24:39 +00: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
TreeHugger Robot
999a23bee0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72c0d984507caddaea744779fd36cdeec11d92ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:58 +00:00
Bill Yi
16761c0f92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie47db7c1f3332d27502c71ea88633a7a21be250c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:54 +00:00
TreeHugger Robot
3b34105f01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00a778116f323c1132677cd846c99f447905e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:45 +00:00
Bill Yi
b807236c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8b6084476147b2d25f7174d8520cf1cf058b662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 06:49:31 +00:00
TreeHugger Robot
2b662c5a07 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
TreeHugger Robot
71826af4fb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
Jason Chiu
6780e6ffdd Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Ied9c640a9a3586efa78eb1456234cbfac44904fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:33:22 +00:00
Android Build Coastguard Worker
bfd29aa26e Snap for 8704672 from 7d634de3ea to tm-release 
Change-Id: Ibe0123678af47a9d21e16c243f4cb503ac00a295
 2022-06-10 01:21:42 +00:00
Bill Yi
c1ebda67c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
 2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
 2022-06-09 09:45:40 -07:00
Gil Cukierman
55e8d38038 Improve documentation of Enable2gPreferenceController 
Test: javadoc changes only
Fix: 235251754
Change-Id: Ieee483fdbeac3e581085c1a776974f82090743bc
 2022-06-09 13:47:45 +00:00
Alan Huang
b9be27b006 [VolumePanel] Fix the Hearable control slice uri parameter 
The provided uri doesn't contain the formatted string, so just append
the width at the end

Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: Idadbb4d725c8ca65bac31fbead8ac1d429ebcea9
 2022-06-09 08:22:33 +00:00