Commit Graph

116640 Commits

Author SHA1 Message Date
Bill Yi
72a1ffcb16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours am: 27d2c1d387 -s ours am: efe0eb20b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I183c5dcf377bca73805f19cde970e97820fb8c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:41:08 +00:00
TreeHugger Robot
0dcef791a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours am: 4c021c6b06 -s ours am: aea49f9352 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11c7534820168674b32676dba8240315f110e369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:41:03 +00:00
Bill Yi
82a69e9ae4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: cbf161d09b -s ours am: 272b07dd04 -s ours am: cc0d0ce6db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I824021f29f132fffd77b4dfe1cc754c24658dbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:40:50 +00:00
Bill Yi
1591f7d908 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 18560c1147 -s ours am: d7cf3b29e3 -s ours am: 2e6ec07996 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieecbe0bdbb1db5d7ada97dbc84607f93a693971e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:40:29 +00:00
Bill Yi
efe0eb20b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours am: 27d2c1d387 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaddb9179e35a0a80b4370626f8fa4cdbf7936f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:33 +00:00
TreeHugger Robot
aea49f9352 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours am: 4c021c6b06 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ec7640944322633e646311cf6b0d7ec1101977e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:26 +00:00
Bill Yi
cc0d0ce6db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: cbf161d09b -s ours am: 272b07dd04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id793292188ec215170a6a3ebd916d29a08f9fb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:24:14 +00:00
Bill Yi
2e6ec07996 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 18560c1147 -s ours am: d7cf3b29e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0dc69afc2aee859cb2002749262878e173d6d8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:23:54 +00:00
TreeHugger Robot
6f62b141bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours am: 034b71d6e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb718634ec1ac72eead8fbabdd35567f6baa5160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:11:06 +00:00
Bill Yi
c1ba5db9bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: c382e1d9fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic74cb796a32c69d06bd9b93ec655e82ec6fae8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:11:04 +00:00
TreeHugger Robot
a8ba31f952 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: 8b14ddae64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaeb8608adbacad7aa5fb8013589923942426097a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:10:58 +00:00
Bill Yi
ace37543a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: 1616649029 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e2f56705beca9373b9d36f0620d1646c09dcc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:10:44 +00:00
Bill Yi
225f5018a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 057922bfa7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb786e5a5843dc8c60bf4bd57e975cb85621094f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:10:27 +00:00
Bill Yi
27d2c1d387 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ccd673e056f7af62f3f5e41850de5b74d0029aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:08:11 +00:00
TreeHugger Robot
4c021c6b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10728a72771cc0f91ea80b6c45aaf390cc2d5717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:08:07 +00:00
Bill Yi
272b07dd04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: cbf161d09b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20839438a4f393b2a8f5a7a7e62e9a6776d82d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:07:52 +00:00
Bill Yi
d7cf3b29e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 18560c1147 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia137801aaf7dba6bb87650ea3a2713101b10002d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:07:35 +00:00
TreeHugger Robot
034b71d6e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e8d3a383c97c8e423d5a3139e36257e665535a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:59:24 +00:00
Bill Yi
c382e1d9fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25c7e7208c40df3771ca5a25ba70a345423cab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:59:18 +00:00
TreeHugger Robot
8b14ddae64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icecafa798adc4d8afa175f84342f55a709f3b765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:59:13 +00:00
Bill Yi
1616649029 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I710f9aa475c481d3a23aaf7443967b73bfcf0617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:58:58 +00:00
Bill Yi
057922bfa7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I234ce82b4725eee473382f133d50c592cc2931ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:58:43 +00:00
Bill Yi
3f4d598606 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ic7b000cb3eac10b6306ad2264f27aa51857614db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:44 +00:00
Bill Yi
cbf161d09b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19aebde57d029ede5dd629754c31ecfffff930ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:26 +00:00
Bill Yi
18560c1147 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fce25558bdfc28f03002c457e65d817011c8c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:55:14 +00:00
TreeHugger Robot
19971433a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-10-10 22:14:13 +00:00
TreeHugger Robot
afe5f1ac18 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-10-10 22:14:13 +00:00
TreeHugger Robot
29e751e021 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-10 20:03:37 +00:00
TreeHugger Robot
320974f1a6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-10 20:03:37 +00:00
TreeHugger Robot
ac17d14412 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-10 20:03:37 +00:00
Bill Yi
177fea7707 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I84d0bcacb71f88a68f961d2d1cf83b8df1bdcdaf
2022-10-09 20:42:21 -07:00
Bill Yi
95447f53a8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia489b62a2937de65887dedb8eaaa34b0e87ce533
2022-10-09 20:41:24 -07:00
Bill Yi
4ba8745b10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95d0d47182909547a30671ac207bc59a5769db98
2022-10-09 20:34:46 -07:00
Bill Yi
783286b516 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I36b5791ec7c6fb6d65d094e84f1282cea10627b0
2022-10-09 20:31:31 -07:00
Bill Yi
467155435c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I30d81e9920cda4cd5d07a1f07456c37b2ac94da3
2022-10-09 20:26:30 -07:00
Bill Yi
9d544547a3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2e3506a75c1d9ce7cb51d0dec205e9ad79b1823d
2022-10-09 20:25:18 -07:00
Chaohui Wang
107109c4ac Merge "Clean up unused AppPermissionsPreferenceController" 2022-10-09 09:51:52 +00:00
Chaohui Wang
a947e88c9f Clean up unused AppPermissionsPreferenceController
This one is replaced by AppPermissionPreferenceController.

Bug: 234570979
Test: m Settings
Change-Id: Id9d16caf33cdea626f79a3cd142dfcde2c54769f
2022-10-09 15:42:01 +08:00
Chaohui Wang
4e35f2596b Apply restricted by admin to the disable button
Currently, we apply the same device policy for both the uninstallation
and disable button.

Also, not double check whether a package is admin (device owner or
profile owner).

Bug: 236346018
Test: Manual on App Settings page
Change-Id: If081fd8ff5422eeac931076a18f73632132a528c
2022-10-09 13:09:40 +08:00
TreeHugger Robot
88f9c8fe7e Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096 am: 45bab9ddc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050

Change-Id: Ia6c96f2c1f1ea869f1fdaebeebd977b0e1612263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08 07:53:32 +00:00
TreeHugger Robot
996a6848e0 Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d33 am: 0b79b2ed99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575

Change-Id: I5105e56934854a74bb05b90577b9853e74f41b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08 07:53:16 +00:00
TreeHugger Robot
45bab9ddc4 Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050

Change-Id: I68b6a8afeb51b04b1c48cf7e4c94e6e9ff5f346e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08 07:21:06 +00:00
TreeHugger Robot
0b79b2ed99 Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev am: d776340d33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20075575

Change-Id: I621842329767134c1a18baafa3f125dd1ca49c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08 07:20:50 +00:00
TreeHugger Robot
4fd86cc096 Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev 2022-10-08 06:54:15 +00:00
TreeHugger Robot
d776340d33 Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev 2022-10-08 06:53:35 +00:00
Evan Severson
38eb8fea44 Merge "Make SensorToggleControllers lifecycle aware" 2022-10-07 19:11:16 +00:00
Jared Duke
5c23de9904 Merge "Refine Settings proguard rules" 2022-10-07 16:07:39 +00:00
SongFerng Wang
bd131dafc2 Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6 am: 97d375875a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005

Change-Id: Ie22a7f98e2c52bcf03acdc5910cbdd762f5bba84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 14:42:32 +00:00
SongFerng Wang
97d375875a Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005

Change-Id: Id8b05f8faaadee52922e785b6e15c40eb1dd12de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 14:09:58 +00:00