Commit Graph

111368 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
a7128bd75f Merge "Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44" into tm-d1-dev-plus-aosp am: d5050ad512 am: 6cf7229269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I2bf1d4ecd3f5f36e0c2e4d93343228dd0c651879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:49:26 +00:00
TreeHugger Robot
603416ef14 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 36c472970e am: 0ad035560f am: 256a547bc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I539a4c64e0caacc2bdee511271ccd2437d3640a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:49:11 +00:00
TreeHugger Robot
3897698b89 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44 am: 23eecdc87d am: 6cd3d586a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I15d83cbbf39b5a1b007b9d25d296cc1ba6a08f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:48:52 +00:00
Automerger Merge Worker
6cf7229269 Merge "Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44" into tm-d1-dev-plus-aosp am: d5050ad512
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I80d7aa05ede76ea970733e80b4cd6949ac9d7005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:02:56 +00:00
TreeHugger Robot
256a547bc9 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 36c472970e am: 0ad035560f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: If94ada63a8f5f48e968a96e4ee323a3834dfd269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:02:38 +00:00
TreeHugger Robot
6cd3d586a5 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44 am: 23eecdc87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I49cddbe7f0056b0801a0d07f2b704299df75e69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:02:28 +00:00
TreeHugger Robot
ab1602fedc Merge "Adjust storage item progress bar height." 2022-06-14 03:50:45 +00:00
Automerger Merge Worker
d5050ad512 Merge "Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44" into tm-d1-dev-plus-aosp 2022-06-14 03:45:27 +00:00
TreeHugger Robot
1b4393b6f1 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I92127d032d5ab8ca41a46e9ec736b4ddf81b8158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:45:24 +00:00
TreeHugger Robot
0ad035560f Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 36c472970e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I34e631b2e35e1f311fb994e2fa80b3e1334562db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:45:23 +00:00
TreeHugger Robot
23eecdc87d Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I7ff555eb9816ccb2031ed4357b82e9ac7979c46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:45:22 +00:00
TreeHugger Robot
2357b8ab44 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: Ie245dbeecf179a41e19699c5fd8de5717da238d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:26:54 +00:00
TreeHugger Robot
8d3f1ccf73 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: I4af9e6e5ccb9a8ceadcfa188af936e412a3849fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:25:56 +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
f84049c4e7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iae080c4ad83f0090a8a4a6bcd2b2438564c563ec
2022-06-13 17:00:54 -07:00
Gil Cukierman
e20a350d2b Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a am: ad8685a28e am: f5c8089089 am: 5050df400d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772

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

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

Change-Id: I7a16c8e1c2a6e397cc14fe92a8d7cd02708d24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:43:42 +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
TreeHugger Robot
2e9cf4f0c3 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 4f31518c41 am: 23d474a36f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I2641787a52c3c69fa5372ac964759230d532dcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:08:38 +00:00
TreeHugger Robot
20bbed4965 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3 am: 751fb13dea am: be7c57781a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: If155198e47c6414dfa299f6c1bd3a6fce69fe519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:08:15 +00:00
TreeHugger Robot
7bb7d91231 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 9d882fbb81 am: 4bdd4359dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I3530811bccb687910bb150b62098371ab3323239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:07:28 +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
TreeHugger Robot
23d474a36f Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 4f31518c41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I1aa20e2860d1c2cc0952c820516b649b74074315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:48:20 +00:00
TreeHugger Robot
be7c57781a Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3 am: 751fb13dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I0f8811fc7cba6bc0636ff01f6de83b30780d25ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:47:29 +00:00
TreeHugger Robot
4bdd4359dc Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 9d882fbb81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: I0ac35362b2d5619ade43a004e948da8b84a0a957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:47:25 +00:00
Gil Cukierman
778d851165 Merge "Improve documentation of Enable2gPreferenceController" 2022-06-13 19:03:49 +00:00
TreeHugger Robot
ccfd91b243 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours am: 0602432a32 -s ours am: fb368c1ade -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: I6179136e55068b443e622e3739c84f2fc01c9211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:03:39 +00:00
Bill Yi
b87ed42698 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours am: b8112dac09 -s ours am: 9a9e114866 -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: Id679191b945e6a4349ce9c1e011c387b17cd5987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:03:28 +00:00
Bill Yi
16c6874e3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours am: 30580dfed4 -s ours am: f2ee2e6a04 -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: I411649a6af354535a30060ecd685731f8607d84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:03:08 +00:00
TreeHugger Robot
9d882fbb81 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Id5aca9149c81f6c29164f832e438c210494ee58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:58:44 +00:00
TreeHugger Robot
4f31518c41 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Iaf4096983d2b3cfb6e56cf336537be5b3f38fa1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:58:36 +00:00
TreeHugger Robot
751fb13dea Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Ie4a6f197d16da945da70d76f0612c59306f1ad5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:49:38 +00:00
Bill Yi
fccc92cfaa Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-13 18:45:27 +00:00
Bill Yi
806c6832ec Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-13 18:45:27 +00:00
Eric Biggers
59fcff0931 Merge "Use StorageManager.isFileEncrypted() instead of deprecated methods" 2022-06-13 18:41:26 +00:00
TreeHugger Robot
a0ebaf2b57 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: I499228ea7bc6dd7971447040dac399dea5cb45d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:31:22 +00:00
TreeHugger Robot
fb368c1ade [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours am: 0602432a32 -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: I2f4676ac1399d9e0fe5f97df580482c2d243e52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:31:13 +00:00
Bill Yi
9a9e114866 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours am: b8112dac09 -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: Idb52a99e6ffbeb42db04a645694e7a3ba65c7538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:30:57 +00:00