Nikhil Kumar
8e67abccae
Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev
2023-02-22 18:03:04 +00:00
Brian Lee
ad2660c0fc
Update RemoteLockscreenValidation detail strings and char limits.
...
Test: Manual
Bug: 270203601
Change-Id: I3d8f707955de49f790e30314b1ff919eb474d138
2023-02-22 09:40:24 -08:00
Henri Chataing
4de9ff1a8f
Merge changes from topic "nfc_logging_control"
...
* changes:
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
Show reboot dialog when users disable developer options
Add a new NFC developer setting option for NFC vendor verbose log
Add a new NFC developer setting option for NFCSNOOP
2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4
Merge "Change API name"
2023-02-22 16:59:10 +00:00
Diya Bera
041d00afac
Merge "Remove duplicate code" into tm-qpr-dev
2023-02-22 16:44:06 +00:00
YK Hung
629782cc88
Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev
2023-02-22 15:06:44 +00:00
YK Hung
c74a6b4fb0
Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev
2023-02-22 14:56:15 +00:00
YK Hung
405bea531a
Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev
2023-02-22 14:41:45 +00:00
Nikhil Kumar
c9cb8e5bcb
Removed isWorkProfile_withSystemUser_returnFalse test
...
Only the UM.isManagedProfile property should be used to determine
whether a user is a managed prfile.
There is no need to perform any additional check on top of
UM.isManagedProfile to make sure the user is a managed profile.
After removing the additional check as part of ag/21512484
DataBaseUtilsTest.isWorkProfile_withSystemUser_returnFalse test
is redundant.
Test: atest DataBaseUtilsTest -c
Bug: 270283369
Change-Id: Ic4fd7eef2ac24786e2a59db7dabc9daf4a7ce028
2023-02-22 11:14:40 +00:00
Zaiyue Xue
7350621d40
Fix b/270290013: Updates battery usage system component icons
...
Bug: 270290013
Fix: 270290013
Test: manual
Change-Id: I92cda88269fdee767b00cd1b9aa78062015a5095
2023-02-22 18:23:20 +08:00
Zaiyue Xue
ca973f43cf
Fix b/270296263: Updates screen system component name to "Display"
...
Bug: 270296263
Fix: 270296263
Test: manual
Change-Id: Iaa42c5576b856ea523dfa8fe92554a82779a62ce
2023-02-22 17:23:55 +08:00
Zaiyue Xue
cc9df56ed4
Fix b/265364509 Update battery usage page footer string
...
Bug: 265364509
Fix: 265364509
Test: manual
Change-Id: I1deef3157ae7c5a8425e2ae438dacebcadd25fce
2023-02-22 15:55:51 +08:00
TreeHugger Robot
22a620dbd4
Merge "Cleaned up the deprecated APIs" into udc-dev
2023-02-22 06:45:01 +00:00
Tiger
f9616e0e5a
Add an developer option to enable config_navBarDefaultTransparent
...
This enables the user to make navigation bar color transparent by
default. It will only affect apps which don't specify the navigation
bar color.
Fix: 232195501
Test: atest TransparentNavigationBarPreferenceControllerTest
Change-Id: I91581558b92abeaa3501b9749f1a1ab43db8e771
2023-02-22 14:44:16 +08:00
Bill Yi
2f3719e7f8
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: Ic023c7947c8ec8d33473fabc1d56cb78701e4f1f
2023-02-22 04:11:52 +00:00
Bill Yi
5bdc27be54
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I18ff4dda537b5743f83b6ed37e8d67a974d1b50c
2023-02-22 04:11:50 +00:00
Jeff DeCew
da1f2578a0
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
am: 05c43c2edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: Id8d24e0960947e53fc309d1e3f6fd776a204677b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 02:39:05 +00:00
Jeff DeCew
05c43c2edc
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: Ie06a7625785dd3c82a50d5e3b1e24b44b54c02ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 01:38:58 +00:00
Chaohui Wang
6461dc3814
Merge "Update HomePageProvider to use getSettingsPage" into udc-dev
2023-02-22 01:28:43 +00:00
Bill Yi
48957d9e2b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5b49fa939841cbd2af7ddc54bd3bf773dd36b916
2023-02-21 17:26:14 -08:00
Bill Yi
1051b47c26
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaee6c70775a043a98864c0f8fb413d92048035f6
2023-02-21 17:17:02 -08:00
Bill Yi
899ab27b2f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id105be6dcfce31f16760f5bafd90cf697beeff68
2023-02-21 17:13:24 -08:00
Jeff DeCew
3c5bbbdb0c
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev
2023-02-22 01:06:41 +00:00
Jack Yu
aeb9d72bac
Cleaned up the deprecated APIs
...
Bug: 270094276
Test: Basic phone funcationality tests
Change-Id: If58b250be461aa05ec3e55390fe73142676b283d
2023-02-21 15:01:23 -08:00
TreeHugger Robot
408a4045f1
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
am: 2ecd05add8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I06dc22c948192703fdf717a735ef9abc3df58496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 21:32:14 +00:00
TreeHugger Robot
2ecd05add8
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I3b215c7f5c824c04837cc84f2af1c81e0702aa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:47:05 +00:00
Jiaming Liu
addeccd855
[automerger skipped] Fix build for jetpack update am: da7f685695
-s ours am: c0e3bdd218
-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: I18bc137f1213009023531b7d27e8a9bb4430697c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:35:55 +00:00
Diego Vela
542b1141c6
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-s ours am: 798e242964
-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: Iadc40ca7f31b5bbd3819fea72b9fa496d4408f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:35:51 +00:00
Jiaming Liu
c0e3bdd218
[automerger skipped] Fix build for jetpack update am: da7f685695
-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: I7f4db3fa4fdc97b6957c1e23938c6b85fea2c117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:34:00 +00:00
Diego Vela
798e242964
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a
-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: Ib0c2a6ededbfc7d0c4caf4cbe85a4420d7967e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 19:33:57 +00:00
Florian Mayer
7450e5cf38
Fix string annotations.
...
The char limit was applied to the wrong string.
(cherry picked from commit 36dd04b1be
)
Bug: 270174344
Merged-In: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
Change-Id: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
2023-02-21 19:03:43 +00:00
TreeHugger Robot
694742152d
Merge "Reduce jank on DND apps page" into tm-qpr-dev
2023-02-21 18:15:25 +00:00
Nikhil Kumar
21b2671c20
Merge "Get profile parent's context in case of work profile" into udc-dev
2023-02-21 12:48:23 +00:00
Bill Yi
b68f49055e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6666b3bab75c42875a1bb406e695aef2813b60d1
2023-02-20 23:39:33 -08:00
Vincent Wang
4e8bded71b
Fix FaceSettings UI problem
...
Update the visibility of button in onStart to avoid missing check
state if Fragment & Activity were restarted
Bug: 269553342
Test: 1. enroll face
2. go to settings > Security privacy > device lock > face & fingerprint unlock
3. Eenter screen lock
4. Click face unlock > delete face model
5.re-enroll face
6.check the UI of face unlock detailed page
Change-Id: I152467afe2cc90932a53fe73b541e97b5b742831
2023-02-21 07:37:17 +00:00
Bill Yi
26e205dfb9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1987daee94e5d3f6ec814ea6fd12dac465b53b4
2023-02-20 23:37:16 -08:00
Bill Yi
e21149b10a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa4a7fab2f08cea2f636f4c5fcc53349a4d33136
2023-02-20 23:28:30 -08:00
Bill Yi
08d0cbb652
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic7d4931508f22b63b4d4b868b13df654d52dc365
2023-02-20 23:27:28 -08:00
Vincent Wang
98d2e83c3d
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev
2023-02-21 05:21:51 +00:00
tom hsu
02f4727ada
[Regional preferences] Modify Temperature and Nubmering system title.
...
Bug: b/265878199
Test: Manual test. See b/265878199#2
Change-Id: I5d2b6f3c6ca9552889702a9f289b37c6de9d99f8
2023-02-21 03:12:13 +00:00
Nikhil Kumar
846d1d26f4
Get profile parent's context in case of work profile
...
In the headless system user mode a non-system user can also have
a work profile.
Refactor DatabaseUtils to get the profile parent's context when
the user is a work profile.
Bug: 270039752
Test: make RunSettingsRoboTests
Change-Id: I1fb78c9d91d59d50880a1ea0dd5f83a3d11dd08f
2023-02-20 18:38:13 +00:00
Jakub Rotkiewicz
c0a7e8f8f0
Snoop Logger: fix descriptions
...
Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
2023-02-20 15:12:31 +00:00
TreeHugger Robot
ae2c14a039
Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev
2023-02-20 12:33:50 +00:00
firewall
7ba30ffcf8
Refactor FingerprintEnrollEnrolling to fragment
...
Bug: b/260957933
Test: NA
Change-Id: I5b65f5957569418e85c39f05bc2fece856ef4a2b
2023-02-20 10:47:48 +00:00
Angela Wang
cd00bf2169
Applies feature flag on Flash Notifications
...
Controls visibility of the Flash Notifications preference with the feature flag.
Bug: 237628564
Test: manual test
Change-Id: I8096479a648c1fe034f436ea362ec0477a9ded77
2023-02-20 09:49:03 +00:00
Angela Wang
5f87e3bb28
Merge "Fixes fail test cases in AccessibilitySettingsTest" into udc-dev
2023-02-20 09:00:06 +00:00
TreeHugger Robot
1d3d688a01
Merge "Put mobile NetworkTemplate in Intent for SearchResultTeampoline" into udc-dev
2023-02-20 08:11:53 +00:00
Arc Wang
5cb2a1fa8d
Put mobile NetworkTemplate in Intent for SearchResultTeampoline
...
BillingCycleSettings and Settings.ACTION_MOBILE_DATA_USAGE needs
mobile NetworkTemplate to work correctly.
Bug: 268411305
Test: manual
Change-Id: I7e2eafff39f1bffeb8adbe4d7c3567b7a4ea7dda
2023-02-20 15:04:26 +08:00
Angela Wang
0e48c55a2a
Fixes fail test cases in AccessibilitySettingsTest
...
AccessibilityHearingAidPreferenceController can't be instantiated
correctly in tests with the lack of LocalBluetoothManager. This causes
null pointer exception when
AccessibilityHearingAidPreferenceController.setFragmentManager() is
called in AccessibilitySettings.onAttach().
Solution: Mocks the LocalBluetoothManager for tests to successfully
instantiate AccessibilityHearingAidPreferenceController to prevent null
pointer exception from happening.
Bug: 269407238
Test: atest AccessibilitySettingsTest
Change-Id: Ibcfffa10b46fd6e85c1b74b03343e5ee0e8843b3
2023-02-20 06:33:58 +00:00
Zaiyue Xue
67fd7d8f6f
Move the same-name-different-product configs from res folder to res-product folder
...
This could unblock the build in go/settings-studio.
Bug: 269974284
Fix: 269974284
Test: presubmit
Change-Id: I962ce24c827d6412af2b861753ae57bd17a27de2
2023-02-20 14:06:09 +08:00