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
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
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
TreeHugger Robot
22a620dbd4
Merge "Cleaned up the deprecated APIs" into udc-dev
2023-02-22 06:45:01 +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
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
Florian Mayer
097a76f8bf
Fix string annotations. am: 7450e5cf38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21522384
Change-Id: Id9516e3d2bdc75d2eddd021a4f2601989662399a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 21:42:29 +00: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
0fd4b8edf7
Merge "Get profile parent's context in case of work profile" into udc-dev am: 21b2671c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21512484
Change-Id: I6829eb15fb21775dfdec2f3abca7cd86c1d88261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 13:26:42 +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
Vincent Wang
251a8cd40d
Fix FaceSettings UI problem am: 4e8bded71b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517331
Change-Id: I0ed199c30485b4c1ed8a2100640aa30d5dcdaa2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 10:55:10 +00: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
Vincent Wang
545be92e5d
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: 98d2e83c3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508164
Change-Id: I6a49438863ca9a93eb8937623432336777081292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 05:52:24 +00:00
tom hsu
7424f3637b
[Regional preferences] Modify Temperature and Nubmering system title. am: 02f4727ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21505314
Change-Id: Ie4ee66ec8547804959ccf9200bf4675cae293784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-21 05:50:48 +00: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
TreeHugger Robot
782287ad07
Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev am: ae2c14a039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502690
Change-Id: Ice7dbb0fe9880b268bef1b441c82503d786f1566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 14:17:18 +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
dd940a31e0
Merge "Fixes fail test cases in AccessibilitySettingsTest" into udc-dev am: 5f87e3bb28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21504366
Change-Id: Iccd1547092dcae617db737207f7b003595cab4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 09:17:49 +00:00
TreeHugger Robot
8d5dde35e9
Merge "Put mobile NetworkTemplate in Intent for SearchResultTeampoline" into udc-dev am: 1d3d688a01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486497
Change-Id: I1715328fb34586e1ed4fbc3fd299d09276ff51b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 09:17:01 +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
TreeHugger Robot
0f7889fe5b
Merge "Attach v2 EnrollingSfpsFragment to activity" into udc-dev am: 4951384ba2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489369
Change-Id: I35b648dde9dd38a1f9538627357c39c0865343d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 05:31:10 +00:00
menghanli
c3343de553
fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921
am: 0f1f626537
am: 1acdb1452d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798
Change-Id: I403f187017005654e047ea84c7ed28e1aa4bc79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 05:30:20 +00:00
TreeHugger Robot
4951384ba2
Merge "Attach v2 EnrollingSfpsFragment to activity" into udc-dev
2023-02-20 04:35:54 +00:00
menghanli
1acdb1452d
fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921
am: 0f1f626537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798
Change-Id: I5a1670b2bc7da6641c4858496a3b162ebdc51393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 04:00:26 +00:00
Milton Wu
20c73a9b06
Attach v2 EnrollingSfpsFragment to activity
...
1. Attach FingerprintEnrollEnrollingSfpsFragment to
FingerprintEnrollmentActivity.
2. Refine FinSensor rotation case for SFPS and RFPS
Bug: 260957939
Test: atest FingerprintEnrollmentActivityTest
Change-Id: Ibbeff8deb009271df044480f9f5d6c64ab6e6264
2023-02-20 03:48:16 +00:00
menghanli
0f1f626537
fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798
Change-Id: I013125cc4d8d979a916a5b585c175698d4502dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 03:01:13 +00:00
Zoey Chen
0b0000a9ab
[Settings] 1.Clean up unnecessary callback 2. register listener and am: 5645c092a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478832
Change-Id: Ie7bfd2a150f5ff203b5566876457d87b5ddbf8de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 19:57:18 +00:00