Commit Graph

120751 Commits

Author SHA1 Message Date
Anvesh Renikindi
ca7d226190 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Ib5945a08241be17df689932a7d7916e418147321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 09:10:56 +00:00
Anvesh Renikindi
a94e4cf2f0 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -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: I3073249788c7243e7948344ca6d39f966262b1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 09:10:51 +00:00
Jiaming Liu
4c2ba829a9 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -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: I2a15c3698c68fd6f995d08acb56ea4a514cafb5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 09:10:50 +00:00
William Escande
17a6f54b56 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I94a513c6fc45aed0922f0747da4856c42a5bcf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 09:09:02 +00:00
Bonian Chen
a9717482a7 [Settings] Customizable resource for hiding 3G preferred network type
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.

Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local

Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
2023-02-23 09:04:50 +00:00
Anvesh Renikindi
410fa6cfc5 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Ic35c8cd9e96390ae88eaea48ed8cdf44e08d911a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:48:54 +00:00
Anvesh Renikindi
445d0468a7 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -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: Ia9c438d4b53e6b14c33bd0d0bea43782d52f8ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:48:47 +00:00
Jiaming Liu
be5caf1230 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -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: I0ad825c754b5940d80085d155ca425728998a828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:48:45 +00:00
William Escande
4df2d78817 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: Ied121b87732ecf6603441a61678be5f5c5f89829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:46:59 +00:00
Bonian Chen
ad209be4af [Settings] EID should be read out as phone number
EID need to support TTS.

Bug: 270517566
Test: local

Change-Id: I630e94cca8d240595546897ac17ae6c59366c84a
2023-02-23 08:45:25 +00:00
Charles Chen
159b42a247 Make Settings show in two-pane on portrait tablet
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
2023-02-23 08:38:52 +00:00
Anvesh Renikindi
bdd54472a8 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Icaaedb8fd5f585ce7c632a6c52fdb286fc60eb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:12:07 +00:00
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