Bill Yi
dd7cc6e3da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours am: ce90d7667c
-s ours am: 93e23bf143
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Iad6653606dd0a479138aa12df760189ffc575216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 22:10:38 +00:00
Bill Yi
bb715f9628
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours am: 96802b6b87
-s ours am: 9ae139073c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: I9df831e7489b40360da70ddae4b0641648342d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 22:10:27 +00:00
Bill Yi
91334e9ef6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours am: 7931cdc634
-s ours am: 6aad472dd7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: I0d46239bb3c1bd1dff307098684f31571aebdd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 22:10:11 +00:00
Bill Yi
93e23bf143
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours am: ce90d7667c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Ide6754ce608595849806942f83c50246dc222f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:41:07 +00:00
Bill Yi
9ae139073c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours am: 96802b6b87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: I69dd33eb0f7766615058cad7c1014007692c5526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:40:56 +00:00
Bill Yi
6aad472dd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours am: 7931cdc634
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: Ie245c6293e0a8602139efd93eff2c34f977f2593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:40:41 +00:00
Bill Yi
ce90d7667c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: If84ed710468ff2b2cbf16d427a6b82c71180966b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:27:15 +00:00
Bill Yi
96802b6b87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Ibe2e81b80090008486ebe9ac88b2acf0bedf4668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:27:09 +00:00
Bill Yi
7931cdc634
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: I2fec3a9a5be1fa658c88dc32da3ccb565022d4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:26:48 +00:00
Bill Yi
925ae72ae7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f336e73db9
-s ours am: fe0c995a5d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918569
Change-Id: I8e6cc8c6f40c13428d724f518ac612f7d7a7c67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:01:33 +00:00
Bill Yi
16eacc3097
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-10-02 20:38:39 +00:00
Bill Yi
fe0c995a5d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f336e73db9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918569
Change-Id: I563f617b607eca39ef91d6450be0f7fa0903f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 19:58:35 +00:00
Omer Ozer
9952d054d9
Merge "Add feature flags for Factory Reset Wizard." into main
2023-10-02 15:44:12 +00:00
Shivangi Dubey
097a9e736c
Merge "Disable Fold lock behavior setting by default" into main
2023-10-02 10:00:10 +00:00
Bill Yi
217974d1f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d0eaf947accd684a1b8d5eed229e46ba3e3bac7
2023-10-02 00:09:28 -07:00
Bill Yi
f336e73db9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I98c3767b717948c0458985d76344f96bd55f6703
2023-10-02 00:05:50 -07:00
Bill Yi
91787589e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6831d85a6b7a6e4b6aa44b4fa79a01b4633917c7
2023-10-02 00:04:15 -07:00
Hao Dong
d11b9d1647
Merge "Use shared lib for settings v2." into main
2023-09-30 17:25:52 +00:00
Bill Yi
51ab3f9536
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b80f7ea863
-s ours am: 714fd9386f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904209
Change-Id: I6421562657df01cf3d14660b3acf17be13b53ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-30 00:00:39 +00:00
Bill Yi
f7424f57e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 582d855820
-s ours am: a0f802846b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904209
Change-Id: Ie3094696f23a8816c8fbb306314428770a924504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-30 00:00:22 +00:00
Bill Yi
714fd9386f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b80f7ea863
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904209
Change-Id: I3c59777bcdf3415b97989198e063ac96ff3084b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 22:55:24 +00:00
Bill Yi
a0f802846b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 582d855820
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904209
Change-Id: Ied8e157ce712c44608f110ee5d33890a735da4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 22:54:57 +00:00
Bill Yi
b80f7ea863
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-29 22:49:01 +00:00
Eghosa Ewansiha-Vlachavas
2c50be71c5
Fix testGetUserMinAspectRatioEntry for both tablets and foldables am: 136bd906da
am: 933b2431fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24879571
Change-Id: I1a08e894582e04583bb2f1e26945cae85f1b4fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 21:51:22 +00:00
Eghosa Ewansiha-Vlachavas
933b2431fb
Fix testGetUserMinAspectRatioEntry for both tablets and foldables am: 136bd906da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24879571
Change-Id: If37a415cc6f53f1f9df7731129dd9fa42341c4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 20:45:20 +00:00
Omer Ozer
8d4d286d8f
Add feature flags for Factory Reset Wizard.
...
Bug: 301283840
Test: Manual
Change-Id: I1e0d71003fe8a5fe93de6ee5a8c725b5abafb048
2023-09-29 18:17:18 +00:00
Daniel Norman
8c64f07213
Merge "Remove importantForA11y=no from a11y activity launch preference." into main
2023-09-29 17:04:43 +00:00
Bill Yi
582d855820
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieac96bbd522889663356dd647c7724e2c7466fe3
2023-09-29 07:56:46 -07:00
Treehugger Robot
e2b80dfa22
Merge "Check for NameNotFoundException when querying for PackageInfo" into main
2023-09-29 12:20:01 +00:00
Xin Li
1d8d403b17
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours am: 2553e934f6
-s ours am: cd5d2e9321
-s ours am: 55d8d7f121
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: I5724424502e9c237930b4ae069b648cfdba6cd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 10:20:34 +00:00
Valentin Iftime
68916a9bbf
Check for NameNotFoundException when querying for PackageInfo
...
PackageManager.getPackageInfo will throw NameNotFoundException if package was/is being removed.
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Bug: 296163845
Change-Id: I3242ac7e68fa7ed99fe99c7de7cd97aaf87948ee
2023-09-29 11:17:00 +02:00
Xin Li
55d8d7f121
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours am: 2553e934f6
-s ours am: cd5d2e9321
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: If35dfbddb17eef9536a4e50c3e2744adbaa9a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 09:04:34 +00:00
Xin Li
cd5d2e9321
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours am: 2553e934f6
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: I33e25c55139500c30fb69c151f2366f944d31caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 08:16:31 +00:00
Xin Li
2553e934f6
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: I35c7d1c5129217358b2e3acbb9033a9ce876a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 07:15:41 +00:00
YK Hung
a191396363
Merge "Fix anomalyEventId metrices action." into main
2023-09-29 06:31:24 +00:00
Sudheer Shanka
c0c4bc065d
Mark quarantine related strings as not translatable.
...
Bug: 297934650
Test: n/a
Change-Id: I050aa992a71838124b8cc331792d181e523a96ab
2023-09-29 00:19:20 +00:00
Anna Bauza
e43590b092
Merge "Declare GuestTelephonyPreferenceController xml exempt" into main
2023-09-28 22:32:01 +00:00
Sudheer Shanka
8af457e732
Merge "Provide SuspendDialogInfo when quarantining an app." into main
2023-09-28 20:20:46 +00:00
Hao Dong
ae40494ee6
Use shared lib for settings v2.
...
Test: settingsv2 tests passed
Bug: 302372183
Change-Id: I6d1b20853b26662c538e804b1191bb720f1d7b8f
2023-09-28 19:16:11 +00:00
Anna Bauza
c0c206920b
Declare GuestTelephonyPreferenceController xml exempt
...
The GuestTelephonyPreferenceController is related to conditional toggle appearance. Depends if Telephony is supprted by the device, therefore it is not statically defined in xml.
Also order list alphabetically.
Bug: b/289967472
Test:
1. Remove @Ignore tag from `CodeInspectionTest#runSliceControllerInXmlInspection`
2. atest CodeInspectionTest
Change-Id: I5fb95bdd5ca8cb2a5aa1096f57a425a2efa74cf9
2023-09-28 19:08:49 +00:00
Behnam Heydarshahi
3a130e2baa
Merge "Declare RingVolumePreferenceController xml exempt" into main
2023-09-28 17:26:08 +00:00
Zoey Chen
60d3f7b7d2
Merge "[ToA] Terms of Address UI, fragment and the list: - Feminine, Masculine, Neutral, Not Specified" into main
2023-09-28 17:00:49 +00:00
Sudheer Shanka
b5441bf782
Provide SuspendDialogInfo when quarantining an app.
...
Customize the dialog to include a button to allow
users to take an app out of the quarantine state.
Bug: 297934650
Test: atest tests/robotests/src/com/android/settings/development/quarantine/QuarantinedAppsScreenControllerTest.java
Change-Id: I1b6e9f057fed91ae131602fd6d6ddf5e23958a65
2023-09-28 14:48:15 +00:00
Behnam Heydarshahi
fcd370f094
Declare RingVolumePreferenceController xml exempt
...
The controller is no longer in use in SoundSettings and should not
affect code inspection.
Bug: b/289967737
Test: 1. Remove @Ignore tag from `CodeInspectionTest#runSliceControllerInXmlInspection`
2. atest CodeInspectionTest
Change-Id: I07cea3c5e2f5282950a63945181cc4711b937bc5
2023-09-28 13:50:26 +00:00
Eghosa Ewansiha-Vlachavas
136bd906da
Fix testGetUserMinAspectRatioEntry for both tablets and foldables
...
Tabelts and foldables now have different aspect ratio values in their
config, so we need to test the devices separately as we shouldnt test for
values that are not in the config of the device the test is run on.
Fixes: 302155585
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I78fa3020501a4be992bb90fea16a6fec4f37594b
2023-09-28 13:23:11 +00:00
Eghosa Ewansiha-Vlachavas
5f624b70ba
Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14
am: 2595f32076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937
Change-Id: Iaa9687110887498c26d246dfed086eb1f8d529af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 12:13:01 +00:00
Eghosa Ewansiha-Vlachavas
2595f32076
Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937
Change-Id: I9ed3cf613ae4b20c1465403be0c989a00be425fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 11:08:02 +00:00
Eghosa Ewansiha-Vlachavas
a3108d5b14
Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev
2023-09-28 10:39:35 +00:00
Yiyi Shen
7edfdba9c8
Merge "Fix SettingsRoboTests for connecteddevice." into main
2023-09-28 10:11:12 +00:00
mxyyiyi
2385e3a714
Fix anomalyEventId metrices action.
...
Bug: 302251479
Fix: 302251479
Test: manual
Change-Id: Ia1a17f8c69dfe6673a122aa4f1c662d4617dc78f
2023-09-28 15:47:41 +08:00