Nikhil Kumar
4096329efa
Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124
Change-Id: I69701d8d501c9207cc17c413519be2cad116cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 18:33:17 +00:00
Florian Mayer
9d99ab422a
Disable MTE developer option if device config overrides it
...
On the backend, the device config would already override the setting by
the UI.
(cherry picked from commit 65116faa29
)
Bug: 269523554
Merged-In: Idd249e060a275b58a399349f202fc68b42964eb0
Change-Id: Idd249e060a275b58a399349f202fc68b42964eb0
2023-02-23 17:58:33 +00:00
YK Hung
edb878db1b
Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109
Change-Id: I3298a3ce189f806219b961c8c733621417309699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:55:20 +00:00
YK Hung
fd3b8bc1dd
Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009
Change-Id: I7933641404c7cbeccc7d8057e66d8a9bd9cdb4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:55:03 +00:00
YK Hung
cc207d81a3
Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev am: 405bea531a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537106
Change-Id: Iedf3c9ba2fd5fbca72517d4287bf0a245ca64c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:54:47 +00:00
TreeHugger Robot
3105ce9819
Merge "Cleaned up the deprecated APIs" into udc-dev am: 22a620dbd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21528007
Change-Id: I819254885e6972c342d53eec9696a1fda876f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:54:26 +00:00
Jeff DeCew
2a269d9b76
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
am: 05c43c2edc
am: da1f2578a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: I6cc344d50231606058bd7a45d18a7c50dfde8fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:53:43 +00:00
Chaohui Wang
81aecc52a5
Merge "Update HomePageProvider to use getSettingsPage" into udc-dev am: 6461dc3814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489365
Change-Id: I82ecba944d71423e68fa49c52bcfe2cfce1107e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:22:33 +00:00
TreeHugger Robot
156ef43064
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
am: 2ecd05add8
am: 408a4045f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I40ea3e965313f192bb15dbc0407ae2216ea3b25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:22:14 +00:00
Jiaming Liu
4fb46658b0
[automerger skipped] Fix build for jetpack update am: da7f685695
-s ours am: c0e3bdd218
-s ours am: addeccd855
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482786
Change-Id: I42b1ed20e4b1ca8313bf6863fd5c7ff9e6441021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:05:22 +00:00
Diego Vela
42eb9e2878
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-s ours am: 798e242964
-s ours am: 542b1141c6
-s ours
...
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482785
Change-Id: I1a8e9f27d381e25939e7bb4a1f23884b8181b771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 17:05:10 +00:00
Zaiyue Xue
ea5b49f799
Fix b/265364351: Light theme icons opacity is too light
...
https://screenshot.googleplex.com/Avqsw3gb2tjKqrK.png
https://screenshot.googleplex.com/46AZuJMjp2HMyqd.png
https://screenshot.googleplex.com/9mE3XutRUNaGckg.png
https://screenshot.googleplex.com/5rNUKMJjhNBNShZ.png
Bug: 265364351
Fix: 265364351
Test: manual
Change-Id: I7521030f1a5d84cd88027fb84a465623610707fb
2023-02-23 21:12:29 +08:00
Daniel Huang
6e6b067863
Merge "Change key name "Meta" to "Action key"" into udc-dev
2023-02-23 12:50:31 +00:00
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
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