Commit Graph

120198 Commits

Author SHA1 Message Date
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
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
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
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
Menghan Li
7376b55651 Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb am: 888f534cef am: 15ba200a81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: I6446163fb5a75cea92dd09a745216c20d2ecb4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 06:09:05 +00:00
Tyler Freeman
7a3e26b9cf fix(tablet): fix magnification banner in dark mode am: 44660662f1 am: 0572328763 am: bbdcb3506a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797

Change-Id: Ideecd82263b6e46fd897b7c90a9a14066009b287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 06:06:19 +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
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
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
a782dd0423 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I63d4ba1fa7676d7c83e9a9ac4e838e17e662a434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 21:20:19 +00: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
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
TreeHugger Robot
8872d5e8a4 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446

Change-Id: If4c670b0093914650a01822eec2361f0b85b5976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 17:37:11 +00:00
TreeHugger Robot
b7ba47c9b2 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445

Change-Id: I480a87927d4fa75df8a18974065a4458ecb62b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 17:36:21 +00:00
TreeHugger Robot
f144ed6e00 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446

Change-Id: I0d754479cb73df75e32008aa6f8a65579e9906fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 16:11:55 +00:00
TreeHugger Robot
82736a7d86 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445

Change-Id: Id346fa53a9bf4840483f233516e265dbf552ce54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 16:06:49 +00:00
TreeHugger Robot
966de44fd9 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446

Change-Id: I8e50b809f73f0f4913672f87f797d9fb4700be99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 15:13:11 +00:00
TreeHugger Robot
510d653b7f Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445

Change-Id: I743f719b6d2561c2f1badd44b36ed623c0206a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 15:12:16 +00:00
TreeHugger Robot
6014caf440 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev 2023-02-17 14:47:37 +00:00