PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,304 Commits 1 Branch 0 Tags
ed4d1eb3a85ef0b885f10bf18fd65b7460f7146d
Commit Graph

111304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
ed4d1eb3a8 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 2ab5c395ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I969829dad347b5436d91614fa391babd0b2cf571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 20:36:01 +00:00
SongFerngWang
4c301a1008 [Setting crash] The dialog is null am: 8514ff65eb am: a49335241a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ibb287f55407f58a3999361b726cf9909346e1852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 20:35:53 +00:00
Bill Yi
443fef15a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 477cf091a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c6293037e94372d1233585d9ef35d10defbc597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 20:35:43 +00:00
SongFerng Wang
db6c2b7af3 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 am: 95f153642c am: 3d14d61621 am: fa5a7f19dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I3a97b5f666c36647b58f00086b48c7b8e1e8f8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:18:28 +00:00
SongFerngWang
0989c696a0 [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours am: a5ddd89091 -s ours am: 879118669a -s ours am: 9231789a8a -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: Ib60fffa482acda0fe47db1e12a8eb63ea84d2cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:18:26 +00:00
SongFerngWang
baf5dca60e [automerger skipped] Reuse the active esim slot am: 887bb592c8 am: da2d1d85aa -s ours am: e74c1c4204 -s ours am: 8710ee1034 -s ours am: f48a455919 -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: Iad00129baacb7f984debe81dc0279b073e4327f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:18:23 +00:00
SongFerngWang
c4037b38e1 [automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b am: 886193184d -s ours am: 82fb3dc1f5 -s ours am: 3af28e34a4 -s ours am: 1b701d688d -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: I1699c1230102bf9c18590fe4e95f9aa8297ba9b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:18:22 +00:00
SongFerng Wang
fa5a7f19dc Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 am: 95f153642c am: 3d14d61621 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I9fa7870cf4bde35bbbb8e812b21495ae6c8ebd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:00:44 +00:00
SongFerngWang
9231789a8a [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours am: a5ddd89091 -s ours am: 879118669a -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: I56d4d681a6b26c45d5900870755f41e456c93b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:00:42 +00:00
SongFerngWang
f48a455919 [automerger skipped] Reuse the active esim slot am: 887bb592c8 am: da2d1d85aa -s ours am: e74c1c4204 -s ours am: 8710ee1034 -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: Idb331b36ebf749d4eb0aaf5fc0ee301d1b596e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:00:41 +00:00
SongFerngWang
1b701d688d [automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b am: 886193184d -s ours am: 82fb3dc1f5 -s ours am: 3af28e34a4 -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: Iab246cb16918657fbbbaa45c67dc4d13f2e8b292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 08:00:40 +00:00
SongFerng Wang
3d14d61621 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 am: 95f153642c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I1418690d52c1e74f74f5d2bbf731ab5170e2c101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:37 +00:00
SongFerngWang
879118669a [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours am: a5ddd89091 -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: I0353cccd4e527e8492502d2662e1db403b1fdd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:36 +00:00
SongFerngWang
8710ee1034 [automerger skipped] Reuse the active esim slot am: 887bb592c8 am: da2d1d85aa -s ours am: e74c1c4204 -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: Id41d905e83f0178ca62d6479afd38e9bf5c6adbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:35 +00:00
SongFerngWang
3af28e34a4 [automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b am: 886193184d -s ours am: 82fb3dc1f5 -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: Ibcb2b5923e98ba54dd0b2770c74d94c9ef0a33b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:34 +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
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
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
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