Bill Yi
46ccfabc0b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours am: f7a1f6301c
-s ours am: 5a56fb9727
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: I81bad65ed7f65b8ee551f163eb939bff12ff807d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:56:18 +00:00
Bill Yi
6ddc9eebcf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419
-s ours am: 0d737ffce4
-s ours am: cc4724d018
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433951
Change-Id: I98da3f1e3e6ea11a904c752230ed22a6f5a9ac07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:55:59 +00:00
Treehugger Robot
4aa411dd4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5
-s ours am: 5152042cef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434909
Change-Id: Iee6751b39d5444ed6d6fbfbcf7177b509b52e536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:49 +00:00
Bill Yi
7c41697bed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6
-s ours am: a3c28a2091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434909
Change-Id: I16f103b18c8781c4a2e4f58950f93df63a482daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:46 +00:00
Treehugger Robot
08d6c6baee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff
-s ours am: 3838cd44da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I602dfab48db1ea812c2db606f9510a6382b7dcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:42 +00:00
Bill Yi
665f49b670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941
-s ours am: 891a483a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I2918c9daa28c1beda0567ad56534b2c4e4b48290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:25 +00:00
Bill Yi
ee4c57c11c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981
-s ours am: c7762b5610
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433950
Change-Id: Id47a02c432d6bc2f352971d2658d3d8f4494bdae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:51:08 +00:00
Bill Yi
5a56fb9727
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours am: f7a1f6301c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: I4d38769e642c41a06b4dd8e1b4931f2159fdddd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:35:48 +00:00
Bill Yi
cc4724d018
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419
-s ours am: 0d737ffce4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433951
Change-Id: I93d49a95aee795501adea2c190f9bc63a1580fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:35:43 +00:00
Treehugger Robot
5152042cef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434909
Change-Id: I34f956e994b81241969d7acca0b058b7f9c90f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:33:39 +00:00
Bill Yi
a3c28a2091
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434909
Change-Id: I6010b1624cd775b42cd5ba2a4a1dc9e1217a9cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:33:36 +00:00
Treehugger Robot
3838cd44da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: Ieb3af1080163c88583ef6eef2ae685b54a4bcf04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:33:28 +00:00
Bill Yi
891a483a94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434424
Change-Id: I1589f5d9786458283f477b96a91e17e0479fbc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:33:12 +00:00
Bill Yi
c7762b5610
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433950
Change-Id: I19410e5ca48c700e7c2747d31f572db6f843ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:32:57 +00:00
Treehugger Robot
3fedf9ec23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 960d04f4fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438749
Change-Id: Ib2c0c1f0d21d9232a1fc2b48212ae20633cc799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:16 +00:00
Bill Yi
819bdb380d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f1150a448
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438749
Change-Id: I6e2c9549775a2f0a8639104b428a5489b50e603e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:13 +00:00
Treehugger Robot
dfa01168ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b9e13e44d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438647
Change-Id: I67d6c789a12d1b01a7ba3b2a9ca5839148af6996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:10 +00:00
Bill Yi
5a87ee3132
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55bf4eab3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24438647
Change-Id: Ib800197d9a8b8c9a42aa7e2ead7a273f63477cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:15:06 +00:00
Treehugger Robot
0f8ac3a82b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5ea61f6900
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437726
Change-Id: I01e3fef35540addc4fd54551563c93e592da6b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:14:55 +00:00
Bill Yi
1a8d90b337
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24437726
Change-Id: Ib286ba6cf5549565b8c080debab8e03084f72f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 18:14:26 +00:00
Treehugger Robot
960d04f4fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-16 17:29:50 +00:00
Treehugger Robot
b9e13e44d8
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-16 17:29:50 +00:00
Treehugger Robot
5ea61f6900
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-16 17:29:50 +00:00
Bill Yi
f7a1f6301c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433953
Change-Id: Iff2068755443b1941a128c323904c6cd6c20067c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:37 +00:00
Bill Yi
0d737ffce4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24433951
Change-Id: I098b4bfef9981e6ed0a1a46271b46e124bcec7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 17:28:18 +00:00
Treehugger Robot
42e15a0ff5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-16 17:20:12 +00:00
Treehugger Robot
eb5aef41ff
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-16 17:20:12 +00:00
Graciela Putri
725efb1a5a
Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev am: 83c8f47ddd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309274
Change-Id: Ic2222519338f30df3d6dd5fea2df5b99bc4eb931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 06:20:48 +00:00
Graciela Putri
83c8f47ddd
Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev
2023-08-16 05:31:44 +00:00
Bill Yi
7f1150a448
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a89870f9adf166a5ea4730b9c99c9adae7b704f
2023-08-15 17:42:02 -07:00
Bill Yi
f2db4ba3b4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f5da554a8b2bbffb823c9bf1bcba9f3acf71675
2023-08-15 17:26:51 -07:00
Bill Yi
55bf4eab3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib467e8e41149b3f7535b421d2c83e7725d9a62e3
2023-08-15 17:18:40 -07:00
Bill Yi
33cf2a3dd6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I80e4d42c270ba65b724a78e18899c2e12082f1e1
2023-08-15 11:07:44 -07:00
Bill Yi
863f3e3a35
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a1b6861b7c389c2c52f63226366510a36ac4987
2023-08-15 11:06:44 -07:00
Anvesh Renikindi
fde4c5d8c0
Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-qpr-dev-plus-aosp
2023-08-15 18:06:08 +00:00
Bill Yi
3c382e6941
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I107e068adba06990b1ce150bfcd4b29841220b23
2023-08-15 11:04:13 -07:00
Bill Yi
55c45ed419
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib12eb53f2344147d55bbd56093f1fa8a945bb1d6
2023-08-15 11:02:18 -07:00
Bill Yi
cf2c3e9981
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7e2f5d483c30a6f1e841534bf2fde598ecd4986
2023-08-15 11:00:29 -07:00
Graciela Wissen Putri
08983e8e63
Add opt-out properties for aspect ratio settings
...
Don't display aspect ratio options if app has opted out. If app has
opted out only for fullscreen, other aspect ratio options should still
be shown.
Bug: 292583399
Test: UserAspectRatioManagerTest
Change-Id: Ia0b223536407f703826d775468c8f8a0b4822e23
2023-08-15 09:14:21 +00:00
Colin Cross
d268d59869
[automerger skipped] Fix kotlin nullable errors in Settings am: 753c96133a
am: 918e687c93
-s ours
...
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 84f8961e67
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423375
Change-Id: I1a0adea61c4a3a517db5593a71a0863a6434fb3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 04:22:59 +00:00
Colin Cross
918e687c93
Fix kotlin nullable errors in Settings am: 753c96133a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423375
Change-Id: I3b1e2e72e98bf2d0bdaaec2c247d2bd9ddfa872e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 03:39:25 +00:00
Colin Cross
84f8961e67
Fix kotlin nullable errors in Settings
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:30:16 -07:00
Colin Cross
753c96133a
Fix kotlin nullable errors in Settings
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:29:53 -07:00
Andreas Miko
4ca80e6013
Change nullability of inheriting function of PinPrivacyPreferenceController
...
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
(cherry picked from commit a7d7eb9a16
)
2023-08-14 17:41:15 +00:00
Vlad Popa
dc5fd85f24
Merge "Add list preference for BT audio device type selection" into udc-qpr-dev am: 3bf2649386
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24396815
Change-Id: I55438a3dc1368de726a86ef2280a2d8424d33113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 17:17:17 +00:00
Vania Januar
ec9b0a08ae
Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035
Change-Id: I458987476dd269d8802b97e730bc9f999c6c864f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 17:14:26 +00:00
Anvesh Renikindi
4eb877cce7
Merge "Remove ExperimentalLifecycleComposeApi" into udc-qpr-dev-plus-aosp
2023-08-14 17:00:10 +00:00
Vlad Popa
3bf2649386
Merge "Add list preference for BT audio device type selection" into udc-qpr-dev
2023-08-14 16:55:46 +00:00
Vania Januar
85de68a968
Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev
2023-08-14 16:47:40 +00:00
Wesley Wang
2545c9b3ae
Update detectSettingsAnomaly() return type (1/2) am: a277f78789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24364875
Change-Id: I02e782eeee61d24e8990746a9993cfb06bfff802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 07:09:39 +00:00