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
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
Hieu Dang
8115b87ea3
Change API name
...
Change getCreateBondCaller to getPackageNameOfBondingApplication
Bug: 269604212
Test: atest BluetoothDeviceTest
Tag: #refactor
Change-Id: Ib596f94a6a718069ca9fb3a1c572ee3583f7504b
2023-02-19 15:11:42 +00:00
Jiaming Liu
da7f685695
Fix build for jetpack update
...
Fix build for jetpack update
Bug: 265818545
Test: build
Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a
)
(cherry picked from commit 5a6444776a
)
(cherry picked from commit 1c0af48f8c
)
2023-02-18 17:01:11 +00:00
Diego Vela
585a7f3c7a
Update ActivityEmbedding usage.
...
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796
)
(cherry picked from commit 65bb5a09f4
)
(cherry picked from commit d2dfc4285e
)
2023-02-18 16:27:45 +00:00
Zoey Chen
5645c092a9
[Settings] 1.Clean up unnecessary callback 2. register listener and
...
manager by subId
Bug: 269742364
Test: manual
Change-Id: Id536dedb200385dc6de5697848f8a68f2302351f
2023-02-18 07:28:56 +00:00
menghanli
8547eb1921
fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences
...
Fix: 269717670
Test: 1. Go to Settings > Accessibility shortcuts > accessibility button & gesture.
2. Observe The Gesture's picture.
3. Go to any other accessibility's shortcut.
4. Observe the picture of the Use accessibility gesture. #2 should look like #4
Change-Id: I11f64648412c9795383d356e80d9dd499095f53b
2023-02-18 13:53:24 +08:00
Menghan Li
15ba200a81
Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb
am: 888f534cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796
Change-Id: I1502bbc8112692c40534a57361a91a85f8977eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 04:37:57 +00:00
Tyler Freeman
bbdcb3506a
fix(tablet): fix magnification banner in dark mode am: 44660662f1
am: 0572328763
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797
Change-Id: I949c5a2c919ee266ae7f28bd9c6ab4f3d55013fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 04:36:40 +00:00
Menghan Li
888f534cef
Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796
Change-Id: If09f5e93946ec39b2a8848de07b9c331f2a57dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 03:36:43 +00:00
Tyler Freeman
0572328763
fix(tablet): fix magnification banner in dark mode am: 44660662f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797
Change-Id: Ide63caf3bfb6e717f8432f759e0767e8624001ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-18 03:35:51 +00:00
Chaohui Wang
048cf57157
Update HomePageProvider to use getSettingsPage
...
Bug: 244122804
Test: Manually with Settings
Change-Id: I57123d3b5461c06e021ab0ccacc94ce8447d1f43
2023-02-18 03:02:04 +00:00
Menghan Li
aa189347fb
Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev
2023-02-18 02:43:12 +00:00
menghanli
e1ce633dd4
fix(tablet assets): update a11y button navigation asset for tablets
...
Fix: 269707768
Test: Go to Settings > Accessibility > Accessibility shortcuts > Accessibility button > Location to "Navigation bar".
Change-Id: I2d56a104848c93d8e6d138c849d05b4a77388c3b
2023-02-18 08:43:36 +08:00
Diya Bera
b7f615bd4d
Remove duplicate code
...
Bug: N/A
Test: N/A
Change-Id: I74208245ec2d46b803e89a1b6a5a3806e7e69739
2023-02-17 23:57:38 +00:00
Tyler Freeman
44660662f1
fix(tablet): fix magnification banner in dark mode
...
Fix: 269717590
Test: Go to Settings > Accessibility > Magnification. Banner should be light A on dark background
Change-Id: Ia9bb696365afc63f4b94048e95a4a41b5680e621
2023-02-18 06:57:03 +08:00
Edgar Wang
962a3932d0
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
am: 420cc9114f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: Ib679057af4da62fe48d94cebc344f477ce438a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 19:51:11 +00:00
Jeff DeCew
bb5d998fef
Do not cache the bubble settings illustration
...
This allows us to load a different asset depending on the configuration of the device.
Test: manual
Bug: 269233648
Change-Id: Ieff757893ca950e649717750a602991e72a943d0
2023-02-17 19:37:16 +00:00
Edgar Wang
420cc9114f
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866
Change-Id: I894b14ab6af7a20469c57b275780597db09d8225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-17 18:52:37 +00:00
Edgar Wang
27d53afa8d
Merge "Move tablet resources to product overlay folder" into tm-qpr-dev
2023-02-17 18:10:59 +00:00
Jack Yu
733b317406
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
...
Bug: 204397062
Test: make RunSettingsRoboTests
Merged-In: Id12e3c10dc04816d4a69692b2d922840a8e84c61
Change-Id: Id12e3c10dc04816d4a69692b2d922840a8e84c61
(cherry picked from commit bcf2efe31e
)
2023-02-17 17:29:56 +00:00
Jack Yu
d91e7a0565
Show reboot dialog when users disable developer options
...
When NFC detailed logging mechanisms are enabled and users try to
disable develoepr options, show reboot request dialog to make sure
NFC logging mechanisms are also disabled.
Bug: 204397062
Test: manual
Merged-In: I531c85fd77934ad7821c480df07465a8cd8f24f9
Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
(cherry picked from commit d270f29cc8
)
2023-02-17 17:29:15 +00:00
Jack Yu
8f1794043c
Add a new NFC developer setting option for NFC vendor verbose log
...
Add a new developer setting option to enable vendor verbose log.
Bug: 204397062
Test: manual
Merged-In: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
(cherry picked from commit 3d2aff896e
)
2023-02-17 17:28:36 +00:00
Jack Yu
a2f8944942
Add a new NFC developer setting option for NFCSNOOP
...
Add a new developer setting option to enable full NFCSNOOP log.
Bug: 204397062
Test: manual
Merged-In: I3fd34500e5e7093c9d77ff737987a35f6866814e
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
(cherry picked from commit b71de640b5
)
2023-02-17 17:27:38 +00:00