Zaiyue Xue
2959831d59
Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev
2023-02-23 11:46:58 +00:00
Avinash Vadlamudi
2a619718ee
Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev
2023-02-23 11:33:41 +00:00
Bonian Chen
7d76797f94
Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev
2023-02-23 11:04:19 +00:00
Bonian Chen
07d60877b6
Merge "[Settings] EID should be read out as phone number" into udc-dev
2023-02-23 10:25:20 +00:00
danielwbhuang
b8e1799527
Change key name "Meta" to "Action key"
...
1. In the modifier key remapping page, the string "Meta" should be changed to "Action"
2. We should add the default focus effect when users go into this page first time.
Demo: https://screencast.googleplex.com/cast/NTA2NjA2MzEyMjI2ODE2MHw2YjRjOTljMi0xMQ
Bug: 269981968
Test: manual
Change-Id: I481be0370166a8831bedc721751e23cee3b39703
2023-02-23 18:01:15 +08:00
Angela Wang
aa54f1b32b
Updates to use flash notification settings keys in settings provider
...
Previously we hard-coded the settings key in FlashNotificationUtils. Change to use internal system settings key for retrieving flash notification settings from the database.
Bug: 266775683
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CameraFlashNotificationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ScreenFlashNotificationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsUtilTest
Change-Id: I1e7a0c4ed58505cfb3c06e43af866744fa1b2d41
2023-02-23 09:17:03 +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
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
Weiyue Huang
1b6ab7ec90
Prevent the screen reader box from unexpected scrolling in dream setting
...
page.
Bug: 228355186
Test: manual
Change-Id: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87
Merged-In: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87
(cherry picked from commit edfd262be2
)
2023-02-23 03:16:00 +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
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
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
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
Henri Chataing
fd0203ee28
[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f
am: 4886f28aba
am: 6a7031515e
-s ours
...
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: I948a11f2df4444b9d64fed97fb661ea35f33e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:36:01 +00:00
Jack Yu
8b0fa20c98
[automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565
am: e1dfe3d417
am: 252dd209b3
-s ours
...
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: Ie49b1ae7183f6a432fae4f2eee8bd70cf338113b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:35:58 +00:00
Jack Yu
3c0d7c9bfb
[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
am: 0797feaf7b
am: 86a6c6a9a7
-s ours
...
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: Ie6c1e6ab59c24778de5c503281b991658c7acd9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:35:53 +00:00
Jack Yu
bac3cfcbfe
[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
am: 81f481fac4
am: 08c64a4414
-s ours
...
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: Ide65bf95812fe09989230b73301c8007d652518f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 19:35:45 +00:00