Commit Graph

117177 Commits

Author SHA1 Message Date
Xuanang Zhao
890d8d2940 Fix the slice provider test.
Change-Id: Ia711b6f66ef7737f57f388b16f9fb9586727e395
Bug: 249101421
2022-10-12 08:33:26 +00:00
Xuanang Zhao
cc64ca6606 Prevent the load of the slice again if it is already
in the cache.

loadSlice just fills Slice read from the DB into a
map, if there is already such slice in the map, we
could skip the async load process.

Change-Id: I6e96ef72a9dc5a833ae158492134f4a6c94a7465
Bug: 249101421
Test: robotest
2022-10-12 08:32:06 +00:00
TreeHugger Robot
c2383a9f81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours am: 8859d2d131 -s ours am: fa8bb92025 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e633acbefd834c07a6df6001699ae7620b4b2db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:25:02 +00:00
Bill Yi
7e30429581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours am: 46ef926c7d -s ours am: b829b80845 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f44fe6e4e9679c99e2a31e32c1fca17a2a55ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:25:01 +00:00
TreeHugger Robot
87ce89bc21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6 -s ours am: fccca2d569 -s ours am: 99fe34343d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf8d146b9c94cb7d8a5d242cb8ccca30b947247f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:24:59 +00:00
Bill Yi
7c000df1c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900 -s ours am: ec126d93fe -s ours am: 5cde47a835 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10599877f83b2bc2e92641f6c7e219af1e830133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:24:43 +00:00
TreeHugger Robot
91e78fac36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2 -s ours am: 2f4c15f95f -s ours am: b05c41db59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9fbbbe7eee07de4c46c24c06eb927e52f58fa4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:24:20 +00:00
Bill Yi
6a831e518f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b -s ours am: ce885622a7 -s ours am: 3adffeec9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f7ef4b6ef2745d4f35ad4a7dc62f36d51cbda78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:23:58 +00:00
Chaohui Wang
2fc09c5117 Clean up AppPermissionSummaryJavaTest
Kotlin Robolectric test could be directly run.

Bug: 236346018
Test: m RunSettingsRoboTests
Change-Id: I0a520236191655d01f2c4b81454627a73a271da5
2022-10-12 16:01:52 +08:00
TreeHugger Robot
fa8bb92025 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours am: 8859d2d131 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa4320cd538c88a8d1cb2500fe4c0d4efc23e6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:51:13 +00:00
Bill Yi
b829b80845 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours am: 46ef926c7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied2b758130a2271060c9b3ced513e998d855bef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:51:11 +00:00
TreeHugger Robot
99fe34343d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6 -s ours am: fccca2d569 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00992b6f3d158974a5077a4e7b163a6acdf673e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:51:09 +00:00
Bill Yi
5cde47a835 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900 -s ours am: ec126d93fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c0cec7637baf7fedae1ca649e0512be6810d845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:50:57 +00:00
TreeHugger Robot
b05c41db59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2 -s ours am: 2f4c15f95f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f4891497f4751e079b1168fd08f4be17c95a2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:50:32 +00:00
Bill Yi
3adffeec9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b -s ours am: ce885622a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0ad188ee18eaa488deee5a44995498b7be16b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:50:07 +00:00
TreeHugger Robot
8859d2d131 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c72497e940e6341d2809211f64fa86a3b56bbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:53 +00:00
Bill Yi
46ef926c7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6477cc86daa19ec48e92d6222fb3324e2be7a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:51 +00:00
TreeHugger Robot
fccca2d569 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4cc6ec27b864db263062e9b809097d4878c754c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:50 +00:00
Bill Yi
ec126d93fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f90720eb10a668f7632e3d5186eac99f8e6aee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:31 +00:00
TreeHugger Robot
2f4c15f95f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d06f2f9223c867a1daf8adf359e83822e6bbafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:25:09 +00:00
Bill Yi
ce885622a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id928ba7eebb872e2e39e97ec3b6dab94685edd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:24:48 +00:00
Tim Peng
b0bef1c529 [automerger skipped] Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev am: 67537336a6 am: f315f0c89f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d965af3a79b703aba6296ad02ebcfd06a826cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:08:17 +00:00
Hugh Chen
8ae452f48b [automerger skipped] RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86 am: b1fac0fb92 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida5f9d23c16e6d0f13e12b17183963222b19971b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 07:08:10 +00:00
TreeHugger Robot
f4e14e153b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
TreeHugger Robot
4cddf997d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
TreeHugger Robot
24c7d47de2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
Chaohui Wang
4357589771 Use getStorageSize from SpaPrivilegedLib
Bug: 236346018
Test: Manual with "All App" App List
Change-Id: If05f334eea365f23e8fc7d7452aed4603c9cdc30
2022-10-12 14:47:28 +08:00
Tim Peng
f315f0c89f Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev am: 67537336a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I16b44dc7bb298426b37669579fc9b175152d3a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:55 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:46 +00:00
Josh Hou
2c4f8fd26f Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev am: 9c2e35244d am: b589be652d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064275

Change-Id: Id41300275c5fa7fde6d688419dc7f4d526ea8da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:07:17 +00:00
Tim Peng
67537336a6 Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev 2022-10-12 06:01:43 +00:00
Wei Wang
f71883b2bb Merge "Fix tests broken by below CL:" 2022-10-12 05:54:54 +00:00
Wei Wang
878ce96163 Fix tests broken by below CL:
platform/packages/apps/Settings/+/0fe65b582abde16c1b46cb314a8358752cef1658

Change-Id: Ie6b6b7ffca15476a05e363fc68d2fa4ba0693895
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.wifi.p2p.WifiP2pSettingsTest.*"
Bug: 252671269
2022-10-12 05:54:34 +00:00
Josh Hou
b589be652d Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev am: 9c2e35244d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064275

Change-Id: I1bfd03028218d068c239a087ca1bd1a5e01286b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 05:34:03 +00:00
Edgar Wang
0b7944d38e Update the strings of Admin-Support Dialog
Bug: 252967902
Test: manual
Change-Id: I1c196aef3bea0771e99487b583c7d29fe9264a98
2022-10-12 13:08:24 +08:00
Josh Hou
9c2e35244d Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev 2022-10-12 05:03:52 +00:00
Lauren Winston
246597c1ac Merge "Revert "Add a cursor preference to Accessibility Settings"" 2022-10-11 23:00:34 +00:00
Xin Li
a8e760c170 [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 5ebaa600a1 -s ours am: 2b11f79bab -s ours
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Ibddecfab34b1063e4378a1e9351830a248fac591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:12:20 +00:00
Xin Li
fd6d6b42d7 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 302b01f8e2 -s ours am: 6c1c71059c -s ours
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Ifc670a8584beb517e1f507635de582bb473bdbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:09:36 +00:00
Lauren Winston
4f493778a6 Revert "Add a cursor preference to Accessibility Settings"
This reverts commit 205018a854.

Reason for revert: Software Cursor not launching in Android U

Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17
2022-10-11 18:32:27 +00:00
Xin Li
2b11f79bab [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 5ebaa600a1 -s ours
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: I8af8de0926f04686ccd5648f6a2c1453d2087166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:58:17 +00:00
Xin Li
6c1c71059c [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 302b01f8e2 -s ours
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Idaef5eec13477eaf80685f9c97234d529d458d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:55:37 +00:00
Xin Li
5ebaa600a1 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:16 +00:00
Xuanang Zhao
4318187037 Merge "Add HINT_PARTIAL to stub slice." 2022-10-11 13:35:09 +00:00
SongFerngWang
c27b674e38 [MEP] the user can't enable the psim when revmovable esim is enabled
The isRemovableSimEnabled method at ToggleSubscriptionDialogActivity
UI is for psim, not esim. It should skip the revmovable esim slot.

Bug: 251384644
Test: build pass. atest UiccSlotUtilTest
Change-Id: I11d0f9528961ec5e47cd8682cf9b6bb988a5700f
2022-10-11 18:48:36 +08:00
TreeHugger Robot
2d539a83da Merge "Add AppPermissionPreference for Spa" 2022-10-11 10:46:19 +00:00
Xuanang Zhao
b28a8a4634 Add HINT_PARTIAL to stub slice.
Change-Id: Idc0847828063afe708b69a5b0a1178b9729a5b5b
Bug: 249101421
2022-10-11 10:42:34 +00:00
Xuanang Zhao
98f7b2b227 Clean the slice in onUnpinned rather than onBinded.
Change-Id: Idda7cbedb0ce7b0ec83fc2f11a2505634d2b465c
Bug: 249101421
2022-10-11 10:35:31 +00:00
Chaohui Wang
2b11c1fe12 Add AppPermissionPreference for Spa
This is the permission preference in the App Settings page.
The summary is single line.

Add the first Kotlin Robolectric Test for Settings, since Kotlin is not
directly supported by the Robolectric test, using a Java class as a
wrapper.

Bug: 236346018
Test: Manual with App Settings page
Test: Robolectric Test
Change-Id: Ic5a4f7d965885a9cd143428a8cd1900981e316a9
2022-10-11 09:15:26 +00:00
Treehugger Robot
fcf10fa0a5 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7 am: 332183ee4d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I3a672bdfab89c1b7048f6501c3444a4b598daaf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 07:29:39 +00:00