Chaohui Wang
a1042f2e2d
Merge "Rename AppSettings to AppInfoSettings for Spa"
2022-10-13 06:04:41 +00:00
Behnam Heydarshahi
ee4d902410
Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 am: 8b2496eb9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409
Change-Id: Ia1b13bf425da2ef90c287b3aaee6231891c67bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 20:38:18 +00:00
Behnam Heydarshahi
8b2496eb9e
Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409
Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 20:07:05 +00:00
Behnam Heydarshahi
7f6c833b89
Merge "Add notification volume controller in settings" into tm-qpr-dev
2022-10-12 19:37:26 +00:00
Raphael Kim
98ace3f8f2
Merge "Fix build error from AssociationInfo constructor change"
2022-10-12 18:43:42 +00:00
Edgar Wang
a307fa1371
Merge "Update the strings of Admin-Support Dialog"
2022-10-12 16:39:21 +00:00
TreeHugger Robot
7316fc6c22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 689350d4d4 -s ours am: 047fd278c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149151
Change-Id: If1f9a63d9889d26654df4c4402fbe91f585e51c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:40:22 +00:00
Bill Yi
84d380bddc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e5a2508d1 -s ours am: d16666c5ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149151
Change-Id: I7ea2163d2f69c681418f270de8d310c928c2c1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:40:20 +00:00
TreeHugger Robot
b8917f71cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9b960b32e0 -s ours am: 5924d82da1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149147
Change-Id: I9ae18fec1564e3f602ff48e3131208c42bb406da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:40:19 +00:00
Bill Yi
38e3808b47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e729683b8f -s ours am: c1d1c86a35 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149147
Change-Id: I9f0bd91cd1bf8a62fd7b1ff0fbf820bda7b8047a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:39:57 +00:00
TreeHugger Robot
03b390536b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 38e1727150 -s ours am: f781e89469 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149144
Change-Id: I18c861b527d43e3b3ae7b50e7d5d73c9deb2764b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:39:34 +00:00
Bill Yi
dd4bbccf7d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f2f1212a6 -s ours am: d129e31815 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149144
Change-Id: I417417cbd454c917cc840464f627a0534f7787b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:39:17 +00:00
TreeHugger Robot
047fd278c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 689350d4d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149151
Change-Id: I982b13a627921fd135213e847df3fbae32976d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:13:30 +00:00
Bill Yi
d16666c5ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e5a2508d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149151
Change-Id: Ida7b0bfa901c3164611a5958dc8626254866e903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:13:27 +00:00
TreeHugger Robot
5924d82da1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9b960b32e0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149147
Change-Id: Id789d09d65c356f51d59ac5673ec6bbba9f114ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:13:25 +00:00
Bill Yi
c1d1c86a35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e729683b8f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149147
Change-Id: Ie01c4539c17f7f2e236ed4d767dac2f8cff62e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:13:14 +00:00
TreeHugger Robot
f781e89469
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 38e1727150 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149144
Change-Id: I2de50f60c22ef567f2a73b0fdecf2eb9bc4b769d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:12:47 +00:00
Bill Yi
d129e31815
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f2f1212a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149144
Change-Id: I6ed4754a876010d7b3a204bdccda0f4129511dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 14:12:23 +00:00
TreeHugger Robot
689350d4d4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-12 13:38:54 +00:00
TreeHugger Robot
9b960b32e0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-12 13:38:54 +00:00
TreeHugger Robot
38e1727150
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-12 13:38:54 +00:00
Chaohui Wang
d44e2ad3f6
Rename AppSettings to AppInfoSettings for Spa
...
To align with current naming.
Bug: 236346018
Test: Make Settings App
Change-Id: I20b2423faf5ee433a530e6a963dd6bb3de33ba90
2022-10-12 19:00:59 +08:00
Chaohui Wang
d07a698301
Merge "Use getStorageSize from SpaPrivilegedLib"
2022-10-12 10:42:25 +00:00
Xuanang Zhao
bac24478a1
Merge "Fix the slice provider test."
2022-10-12 10:14:24 +00:00
Chaohui Wang
5f01823016
Merge "Clean up AppPermissionSummaryJavaTest"
2022-10-12 09:46:37 +00:00
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
