Anvesh Renikindi
fc43a1156c
[automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3
-s ours am: 928a3c22a6
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I0871de1f2f49e376caa48efbcc1b18c3dfb3f46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 08:12:04 +00:00
Jiaming Liu
8b4f036a3f
[automerger skipped] Fix build for jetpack update am: b9f82bed98
-s ours am: 47c2b78f94
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I2fde4d7e483d101e99e4b9274f6bda3454c39031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 08:12:02 +00:00
William Escande
6ea3322de4
Merge "Snoop Logger: fix descriptions" am: 5fd265405c
am: 57f3e9428f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I34edde4f5dc5b5290f796d1bd8b5e8f07eab9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 08:11:05 +00:00
Zaiyue Xue
cbd5223bc7
Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list
...
Bug: 265364507
Fix: 265364507
Test: manual
Change-Id: Ia428a0854c42dacff130c2492ae11642643043b0
2023-02-23 16:01:07 +08:00
Anvesh Renikindi
3b08c0d9db
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919
Change-Id: Iff9e2012e64c7776ccfeba98b69afca280ef13b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:18 +00:00
Anvesh Renikindi
928a3c22a6
[automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I57bf736b9fdc9cf9100139a65c0df5d5fd88f7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:13 +00:00
Jiaming Liu
47c2b78f94
[automerger skipped] Fix build for jetpack update am: b9f82bed98
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I6ab1de1556098dc77963331f2f0c2dc14c7aef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:11 +00:00
William Escande
57f3e9428f
Merge "Snoop Logger: fix descriptions" am: 5fd265405c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:21:57 +00:00
Anvesh Renikindi
eaf3ecceae
Merge "Update EmbeddingAspectRatio to the latest"
2023-02-23 06:38:08 +00:00
Anvesh Renikindi
60763d6941
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property"
2023-02-23 06:22:15 +00:00
Anvesh Renikindi
a54ecedde3
Merge changes from topic "androidx_ae"
...
* changes:
Fix build for jetpack update
Update ActivityEmbedding usage.
2023-02-23 06:22:15 +00:00
William Escande
5fd265405c
Merge "Snoop Logger: fix descriptions"
2023-02-23 05:58:19 +00:00
Avinash Vadlamudi
e644d26b95
[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method
...
- The method isAutoPinConfirmFeatureAvailable is changed to static, so refactoring the code to use it properly.
Bug: 270315296
Test: Manual Test
Test: atest AutoPinConfirmPreferenceControllerTest
Test: atest ChooseLockPasswordTest
Change-Id: Idecaeca296b9ae9acdd0c094dcbb736db31b74b3
2023-02-23 05:56:58 +00:00
Henri Chataing
b2e4e3c85f
Nfc: Rename system properties in Nfc settings
...
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.
Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b
)
2023-02-23 01:48:42 +00:00
Becca Hughes
0172ff6942
Update strings based on UX/product feedback
...
Update settings strings for cred man based
on feedback.
Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
2023-02-23 00:36:16 +00:00
TreeHugger Robot
0b8905c899
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d7b8a73da9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531856
Change-Id: Ieec24470468667b24be0a41a7bcb5f9e954f2c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 23:06:24 +00:00
Bill Yi
73b23bd877
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48957d9e2b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531856
Change-Id: Iba2cb15dd2524f8a6275e583ab0743f7ec7fb4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 23:06:20 +00:00
TreeHugger Robot
a3819b8984
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846
Change-Id: If88901f310f6e293b4f72b52e20a520ef6351cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 23:06:13 +00:00
Bill Yi
b57f9b481e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1051b47c26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846
Change-Id: I297ec7aac1619dc69b0214cc4ed8212b3f2561be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 23:05:55 +00:00
TreeHugger Robot
df6ca5042e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2593eaea99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: Ib35c6faebc4595262e49ce8b8d82651bba40948b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 23:05:44 +00:00
Bill Yi
6f41b549cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: I5be0de35574a19dd96fc77598890a20b48123f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 23:05:37 +00:00
Bill Yi
00181c65d8
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-22 22:54:05 +00:00
Bill Yi
02895aca61
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-22 22:54:05 +00:00
Bill Yi
d2394e7eb2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-22 22:54:05 +00:00
TreeHugger Robot
d7b8a73da9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-02-22 22:29:16 +00:00
TreeHugger Robot
7d1dbd3e1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-02-22 22:29:16 +00:00
TreeHugger Robot
2593eaea99
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-02-22 22:29:16 +00:00
TreeHugger Robot
1a2cd2f231
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e
-s ours am: 24c843fb30
-s ours am: 3648275e0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: Id594fd5c868b27bb815de220b8c47df0832c180c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 22:18:16 +00:00
Bill Yi
8c2a537db4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e
-s ours am: 07b4ad75b4
-s ours am: 69803e4b8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I2eb1dbe379dd60388973a5619844de63e27b1a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 22:18:06 +00:00
TreeHugger Robot
a8cdf1d6c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759
-s ours am: 95d0cc1766
-s ours am: 6ac3ac9e63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I6b5fa355630196f70bec7afec648b43f9aff232a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 22:17:51 +00:00
Bill Yi
bb8a56689d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9
-s ours am: 881db50b16
-s ours am: 88743c60d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I0666f24c1d6bdfe58759887fd7b29a9c6535c9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 22:17:39 +00:00
TreeHugger Robot
3648275e0e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e
-s ours am: 24c843fb30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I70e3fed8ce7a06b6f0e7225f0d9e0c6905d07ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:35:15 +00:00
Bill Yi
69803e4b8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e
-s ours am: 07b4ad75b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I3597d9a1692f48194af397c7265e87406477797c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:35:11 +00:00
TreeHugger Robot
6ac3ac9e63
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759
-s ours am: 95d0cc1766
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I9e07f47fd852dc41754a4ddaeeee9e714c59340c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:35:00 +00:00
Bill Yi
88743c60d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9
-s ours am: 881db50b16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I01733befb823376d5c46a3f467cfba395d1d4335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:34:27 +00:00
TreeHugger Robot
24c843fb30
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I181ec169fe63702914c012f349dbe327bfbbbe15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:57 +00:00
Bill Yi
07b4ad75b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I55edf94ba4c2952f50d2757ee3de2eac8236eccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:49 +00:00
TreeHugger Robot
95d0cc1766
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I516ae5d20d4f21a3bc455c02328b873d18a9a427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:44 +00:00
Bill Yi
881db50b16
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: Ic1d40a8aad4b268384097ce8ca3e310aeb31bb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 21:13:13 +00:00
TreeHugger Robot
0e28d1212e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-22 20:59:45 +00:00
TreeHugger Robot
decc8d0759
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-22 20:59:45 +00:00
TreeHugger Robot
17b826c715
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d
-s ours am: cb5e97de8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I9038fc225657da1c2f08dd13ffb540919e0fd9a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 20:56:57 +00:00
Brian Lee
6ee1e33ec4
Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915
Change-Id: I3a9dfc470d76dbe69df8d930dcf457b8ac1e3221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 20:55:36 +00:00
TreeHugger Robot
d1a5cdb191
Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I012645ac5c552ea0ee063d904bc7169ac2304157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 20:53:13 +00:00
Bill Yi
0a767ee9ee
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
am: 5bdc27be54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: Icddf5d14f16b066e4fe416748135c9862e83f416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 20:53:08 +00:00
TreeHugger Robot
cb5e97de8a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I18425b81f49cd14ace2e42f9122b46338e78a76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 20:50:10 +00:00
Julia Reynolds
e39c0bbe8b
Clarify string for translation
...
Test: view string in UI
Fixes: 243971120
Change-Id: I7f21df52b831e87447a7001acd16b3e1e5325372
2023-02-22 15:47:14 -05:00
Brian Lee
79effa02d3
Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev
2023-02-22 20:34:17 +00:00
TreeHugger Robot
5699a3d93d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-02-22 20:15:56 +00:00
TreeHugger Robot
97675e3475
Merge changes from topic "tc_change_23022120_22" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
Import translations. DO NOT MERGE ANYWHERE
2023-02-22 20:15:45 +00:00