Simon Wingrove
cb9da5907d
Merge "Use trampoline for FaceEnrollIntroductionInternal" into main
2024-04-08 08:57:37 +00:00
Chaohui Wang
d305931e3f
Add icon to differentiate pSIM and eSIM
...
Fix: 330096133
Test: manual - on SIMs
Change-Id: I7b7f5d91492d72d66cecf17e52fde1b51ad37832
2024-04-08 16:37:34 +08:00
Jason Chiu
584d43dd7e
Update char limit for auto-sync data dialogs
...
Bug: 331566548
Test: build
Change-Id: Ie816138bcbdac98fe8636ab9ffa9a7509453f17a
2024-04-08 08:32:11 +00:00
Chelsea Hao
2b093ade89
Auto on string update.
...
Change-Id: Ifbf090004b37762943128e71849667d7e9b05210
Flag: NA
Bug: 332982362
2024-04-08 06:27:31 +00:00
Treehugger Robot
91b9b1f65a
Merge "Remove tc id from leak in AOSP" into main
2024-04-08 04:33:56 +00:00
mxyyiyi
c2ab2e60a1
Remove tc id from leak in AOSP
...
Bug: 331766433
Test: Manual
Change-Id: Id0e63ad26d3571b3aca7dfe8e56b863eb5ae3a71
2024-04-08 10:58:15 +08:00
Chaohui Wang
bae147bab3
Close ApnSettings when subscription not enabled
...
Including the case that physical sim is removed.
Fix: 332885481
Test: manual - on ApnSettings
Change-Id: I9bc77f995b6c1e98046a84fafb05f9b61d71ce70
2024-04-07 15:57:53 +08:00
Xinyi Mao
fd0c2c1748
Merge "Split page title and toggle title due to the request from L10N team" into main
2024-04-07 06:40:19 +00:00
mxyyiyi
7fb3a5346a
Split page title and toggle title due to the request from L10N team
...
Bug: 331766433
Test: Manual
Change-Id: Iee457c404206dd287b9eb15e38f56ac5c7717640
2024-04-07 13:09:23 +08:00
Chaohui Wang
950091d4a4
Improve content description of data usage chart
...
Use full month description, and add comma between date and percent.
Fix: 318771241
Test: manual - on DataUsageList
Change-Id: Ice18f162ab7cb908a3582308495bfddbd3dff488
2024-04-07 03:45:51 +00:00
Treehugger Robot
939a32d17e
Merge "Fix-up starting style&wallpaper from search" into main am: c37f89dff9
am: 158f1d1ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974798
Change-Id: Ia306e5d381193dbfe931f08518c281cf3ce1d0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-06 02:43:35 +00:00
Treehugger Robot
158f1d1ca8
Merge "Fix-up starting style&wallpaper from search" into main am: c37f89dff9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974798
Change-Id: I9b24f56375b9389ade258be1f9d22d550541e4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-06 02:27:45 +00:00
Treehugger Robot
c37f89dff9
Merge "Fix-up starting style&wallpaper from search" into main
2024-04-06 02:13:17 +00:00
Ellen Arteca
197618b57a
[automerger skipped] Merge "Show customized message for private space while choosing lock" into main am: 27b7b2fa50
am: ab574330de
-s ours
...
am skip reason: Merged-In Ic8173ff8c1af23fc593390acaff4c67390f99b9c with SHA-1 223737e0b5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3011727
Change-Id: Ia373ed17ca3b453615e4fda368a682123e3bec1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-06 01:08:48 +00:00
Ellen Arteca
ab574330de
Merge "Show customized message for private space while choosing lock" into main am: 27b7b2fa50
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3011727
Change-Id: I54ac2698f2dbbe918f204d26d040a6d59127b87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-06 00:51:18 +00:00
Ellen Arteca
27b7b2fa50
Merge "Show customized message for private space while choosing lock" into main
2024-04-06 00:32:09 +00:00
Rafael Higuera Silva
0d3a8998dd
[automerger skipped] Merge "Add new warning dialogue when user is Resetting mobile network settings." into 24D1-dev am: f6e0b08fc6
-s ours
...
am skip reason: Merged-In I47d9b868b649b259d5e4008ec742317d2cb7cf51 with SHA-1 147cc19b53
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804198
Change-Id: I4bb060bc927854f6afdae2f795bdd356e9d774dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 23:57:40 +00:00
Rafael Higuera Silva
43c47c5dd3
[automerger skipped] Add new warning dialogue when user is Resetting mobile network settings. am: 363535192d
-s ours
...
am skip reason: Merged-In I47d9b868b649b259d5e4008ec742317d2cb7cf51 with SHA-1 147cc19b53
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804198
Change-Id: I9110f732bd8f2edb3a45ffee609be5ecbeff98ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 23:57:36 +00:00
Rafael Higuera Silva
f6e0b08fc6
Merge "Add new warning dialogue when user is Resetting mobile network settings." into 24D1-dev
2024-04-05 23:43:02 +00:00
Rafael Higuera Silva
363535192d
Add new warning dialogue when user is Resetting mobile network settings.
...
If the user is reseting mobile network settings and have all these
conditions:
- No Wi-fi
- Has check to delete all eSIMs
- Has a least one RAC sim carrier
Then show the warning dialogue.
Test: make, manually test, atest SubSettingLauncherTest, atest ResetNetworkTest, atest SubscriptionUtilTest
Bug: 328649510
Merged-In: I47d9b868b649b259d5e4008ec742317d2cb7cf51
Change-Id: I47d9b868b649b259d5e4008ec742317d2cb7cf51
(cherry picked from commit 147cc19b53
)
2024-04-05 21:39:13 +00:00
alukin
67835caf33
Split Documents&Other
...
Splitting Documents&Other category in
Settings > Storage into "Documents"
and "Other".
"Documents" category is calculated by
querying MediaStore for all files with
MediaType = "Document".
"Other" category is calculated by
querying MediaStore for all files with
MEDIA_TYPE != "Image" AND MEDIA_TYPE != "Video"
AND MEDIA_TYPE != "Audio" AND MEDIA_TYPE != "Document".
Bug: 328505030
Test: atest StorageItemPreferenceControllerTest
Test: atest StorageCacheHelperTest
Change-Id: I413c502c7b3fd66df9a3b5e0d91f8bd024f4b6e0
2024-04-05 19:54:21 +00:00
Weng Su
dd0c69f87f
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours am: c70a02037d
-s ours am: 0abcc6d070
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I616473758f8089359bd010dd83acbf50c1e8fcd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:37:24 +00:00
Weng Su
cf7cfa6a0c
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours am: 8695639429
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I4a979c4c9b0a206d53da288fcfa1d166f4682704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:23:55 +00:00
Weng Su
0abcc6d070
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours am: c70a02037d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I2ef9b190b078c7449241c91e3456dee2174363ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:23:50 +00:00
Weng Su
8695639429
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I0039d044f1164349132f2cdc969d2930d708c566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:11:31 +00:00
Weng Su
c70a02037d
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I9c69e4b2f3a0e595d3b7ea39961a269b1275a7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:11:14 +00:00
Weng Su
1112a774e0
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I074db2071f87741f334c35459655b1946d92339a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 16:53:53 +00:00
Manish Singh
f2869fd64e
Merge "Remove all Settings tasks from Recents when PS is locked" into main
2024-04-05 15:06:41 +00:00
Rafael Higuera Silva
fd27947e6f
Merge "Add logic to log interaction of RAC warning dialog." into main
2024-04-04 22:47:12 +00:00
Faye Yan
c00b3c7775
Merge "Revert "Add Voice activation apps into Settings->Apps->Special a..."" into main
2024-04-04 22:30:06 +00:00
Faye Yan
b7f3c5a62d
Merge "Revert "Add Voice activation apps into Settings->Apps->Specific app->AppInfo->Voice activation apps"" into main
2024-04-04 22:30:06 +00:00
Weng Su
679e2d6556
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours am: 74c1cf0e7b
-s ours am: fe84674bf9
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I0c1bec8437fe7422f59ee055373710328860126a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 21:06:45 +00:00
Faye Yan
b5aab77162
Revert "Add Voice activation apps into Settings->Apps->Specific app->AppInfo->Voice activation apps"
...
This reverts commit 7f2fbc2e4c
.
Reason for revert: voice activation is not going in V
Change-Id: Idfabfd48f45d2ace7de9f8498181f281ad0358a1
2024-04-04 21:02:46 +00:00
Weng Su
fe84674bf9
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours am: 74c1cf0e7b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I3554a4f09f2aca6f1f39c69d4564faed19615e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:51:21 +00:00
Weng Su
98ab104f20
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours am: 1f57fe8c0e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I6ecbd3c83f7619a54e76007f3b285dc6d3386227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:51:12 +00:00
Weng Su
b70ace131b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 146d51f2cc
am: 1f2fc04f17
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I49b5c401f9b0dcafe7cf65e9b5d37b9203951d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:36:03 +00:00
Weng Su
1f57fe8c0e
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I97155789f7e3b2dc9698ce955a8e7b3236f5722e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:33:54 +00:00
Weng Su
74c1cf0e7b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I3fd4e0ecb10c7bf587ad45fc174ad0fb2f2ccb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:33:36 +00:00
Weng Su
981673f940
[conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I7f37ea9867aff063d8a22580d84ab0007abad77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:29:43 +00:00
Weng Su
03dd808b90
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 34b0650655
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I6ac752afb4fdcb6d59d039f0eb3467ea5ea7be9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:20:55 +00:00
Weng Su
70d03ec35b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I190f6f720fa4a6f1fe6f737414a2b8f485a5a4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:13 +00:00
Weng Su
1f2fc04f17
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 146d51f2cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: If2fb5dea84a4e7f26186a062bd9b946709642da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:04 +00:00
Weng Su
34b0650655
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I28bc46ff37bf11a9fa6b92eaa78c6d77f7cd4e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:48 +00:00
Weng Su
146d51f2cc
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I2f57a28bbc46a1f648d6ecf0a72eab3a884e69e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:34 +00:00
Weng Su
3d6b2b688e
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I475d313032f26d9e835f04d4b8f6ed0e03fb4075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:12 +00:00
Weng Su
4a93bd9f39
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I1c23b0952d7e372848fe7486f2efea34b94e9253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:11 +00:00
Faye Yan
d0b0881810
Revert "Add Voice activation apps into Settings->Apps->Special a..."
...
Revert submission 25108596-va-special-access
Reason for revert: voice activation is not going in V
Reverted changes: /q/submissionid:25108596-va-special-access
Bug: 306447565
Bug: 393727896
Test: presubmit
Change-Id: I4977e7d543cb800fc9fb6962bba3afebb9480dcc
2024-04-04 18:50:57 +00:00
Hao Dong
617c73cd37
Merge "Show "no thanks" button when scroll is not needed." into main
2024-04-04 18:17:35 +00:00
Joseph Vincent
0882f3c105
Merge "Remove "skip lock screen" from private profile face setting" into main
2024-04-04 17:56:54 +00:00
josephpv
2c631fcd56
canAddPrivateProfile checks for private space creation test
...
Bug: 332854426
Test: atest PrivateSpaceMaintainerTest, atest PrivateSpaceDeletionProgressFragmentTest
Change-Id: I50ddd15f53e14b54a2d8df201b94f8423eec3d72
2024-04-04 17:33:54 +00:00