Commit Graph

120357 Commits

Author SHA1 Message Date
Darrell Shi
8ba70d32e2 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: I097729dd0420387e67d8aa7eba9642c4834330d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:12:28 +00:00
Vincent Wang
8e3c46b1c9 Merge "Fix UDFPS enrolling crash" into udc-dev 2023-03-01 09:12:38 +00:00
Vincent Wang
f2db627a7c Fix UDFPS enrolling crash
Bug: b/271208595
Test: 1. adb root
      2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
      3. Record fingerprint
      4. Check setting work normally
Change-Id: I69cc50cd677e80a57bb430a5a295c46b519d7755
2023-03-01 07:43:04 +00:00
TreeHugger Robot
c5054d5907 Merge "Disable MTE developer option if device config overrides it" into udc-dev 2023-03-01 06:21:23 +00:00
Chaohui Wang
f74d6003ff Merge "Fix App Info item summaries not refreshed" into udc-dev 2023-03-01 05:47:06 +00:00
Bonian Chen
6113725b61 Merge "[Settings] Improve logging to support issue triage" into udc-dev 2023-03-01 03:59:03 +00:00
Julia Reynolds
510cb8f22e Merge "Make string the same across screens" into udc-dev 2023-02-28 23:30:15 +00:00
Julia Reynolds
20c5853744 Merge "Fix settings crash" into udc-dev 2023-02-28 23:02:06 +00:00
Julia Reynolds
e75dfc6f05 Make string the same across screens
Test: view notification settings
Fixes: 245912213
Change-Id: Ifb1966a2102afa38ed00bb81e08bbd1b92123a55
2023-02-28 17:10:24 -05:00
Bonian Chen
62e934a039 [Settings] Improve logging to support issue triage
1. Avoid from deprecated warning log
2. Add targetting subscription id into log

Bug: 271126362
Test: local

Change-Id: I6eac2032cc29b193dab009626a9824ee4fb451f5
2023-02-28 17:56:35 +00:00
Avinash Vadlamudi
019ce4c02c Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev 2023-02-28 15:10:27 +00:00
TreeHugger Robot
7e9d6e7d22 Merge "Refine FingerprintEnrollmentActivity" into udc-dev 2023-02-28 12:58:53 +00:00
Darrell Shi
d8f61dc2a3 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: I404de08142653608ff054be43c70d4323b063861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 12:38:18 +00:00
Avinash Vadlamudi
7da92e9295 [Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state
- Save and restore the autoPinConfirmOptionSetManually field during activity restart (because of orientation change)
- This helps to retain the state of the auto confirm unlock checkbox  during an orientation change during set PIN stage.

Bug: 268592440
Test: Manual Test
Test: atest ChooseLockPasswordTest
Change-Id: I48ce9080b6007fb4e3a5ca5013d6c21ed4ba664f
2023-02-28 11:54:16 +00:00
Chaohui Wang
e34d95d68e Merge "Disable the middle pages during development" into udc-dev 2023-02-28 11:43:05 +00:00
Chaohui Wang
f46cdad05d Fix App Info item summaries not refreshed
On tablet, "Open by default" & default app shortcut not refreshed when
settings changed.

Changing from liveData to flow fix this issue on tablet.

Bug: 236346018
Test: Manually with App Info
Change-Id: I6e3a174bdbecb154e39e111ecf695b1146c484df
2023-02-28 19:37:55 +08:00
TreeHugger Robot
de10018301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours am: 488d3adb81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If39365a1964c49b7ee609fe0f88f6b5dce6bc9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:40:01 +00:00
Bill Yi
0f86c524c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c -s ours am: 934826d8d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c75ab1453ac6d2491881c6981ff5d6ca393f12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:39:55 +00:00
TreeHugger Robot
98e097b2e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642 -s ours am: 62a6197006 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94fb8806123683ab43a3f75fdeefda6a191b75c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:39:40 +00:00
Bill Yi
49c2652453 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a -s ours am: 47d7d69611 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id472fd8a72cf62a383942953901c18e13570dc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:39:27 +00:00
Bill Yi
8f600b3932 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1 -s ours am: 5d6536ce44 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43d982ef1c633b0fb592a81b3cd49c55cc20862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:39:11 +00:00
TreeHugger Robot
488d3adb81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id7f81ddfe5f308de358950a5eba75a2852f29f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:06:37 +00:00
Bill Yi
934826d8d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c800f6e4828b492ee35ba09492fac1f388f3fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:06:33 +00:00
TreeHugger Robot
62a6197006 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib76fbcdf3c4c9a282bcb659941d0ea465d1ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:06:29 +00:00
Bill Yi
47d7d69611 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib27e69a8c83f8a538a387a3b95d137d68841d739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:06:17 +00:00
Bill Yi
5d6536ce44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8aea0e66f39df752b06ba85adc5201a8bd1ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:05:41 +00:00
TreeHugger Robot
8e002f962e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-27 23:59:16 +00:00
Julia Reynolds
57a42d2a93 Fix settings crash
Test: post notification with an action with a null title, view
notification widget
Fixes: 250836823

Change-Id: I56707c628b3fcc7d6823e4b3736dd26e3d98dfa7
2023-02-27 16:24:21 -05:00
William Leshner
01dfbcc297 Merge "Restrict screen saver settings searches to enabled users." into udc-dev 2023-02-27 17:30:48 +00:00
Bill Yi
a2cbc7ea7c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I15d98108201d7c114ffd7e30f3141af4e8fc0497
2023-02-26 20:37:26 -08:00
Bill Yi
c253ffe61a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic10f43fb3b99fbf09a56366b4d0e0fd864741d05
2023-02-26 20:36:20 -08:00
Bill Yi
99b4d024d1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I48f351db5e5fb38e3ea5f197f7648c805d21c487
2023-02-26 20:34:24 -08:00
Milton Wu
94b421b253 Refine FingerprintEnrollmentActivity
1. Fix backstacks after enrolling finish
2. Support skipFindSensor and skipIntro

Bug: 260957939
Test: Manually test it on different sensor devices
Change-Id: I4061e29999a47bf4859d6562ad82330fb0f6f620
2023-02-25 08:08:31 +00:00
Weng Su
d078d1f00a Merge "Refer to the last Hotspot password when generating the password" into udc-dev 2023-02-25 02:33:55 +00:00
TreeHugger Robot
887a733ebb Merge "Update strings based on UX/product feedback" into udc-dev 2023-02-25 01:05:32 +00:00
Henri Chataing
c2c408f3b4 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I4edc194d398c13b80df97c682c7494fb1962a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 01:02:19 +00:00
Henri Chataing
5bb48d9250 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ia03c857e442f801d7fb042dda4c186aeb1dce1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 23:54:34 +00:00
Will Leshner
ca1379f0b3 Restrict screen saver settings searches to enabled users.
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.

Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.

Change-Id: If2f465b2acb548455f0868507cf47217ea1a626f
2023-02-24 15:36:48 -08:00
Henri Chataing
1325de7875 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 23:02:43 +00:00
Becca Hughes
b52fb4ce0b Update strings based on UX/product feedback
Update settings strings for cred man based
on feedback.

Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
(cherry picked from commit 0172ff6942)
Merged-In: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
2023-02-24 19:50:50 +00:00
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
TreeHugger Robot
3a445a3ea1 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev 2023-02-24 18:54:44 +00:00
Darrell Shi
6b6c68fd94 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev 2023-02-24 16:10:13 +00:00
TreeHugger Robot
f9ef8e39f5 Merge "Fix b/270656372 unit test failure." into udc-dev 2023-02-24 13:06:28 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100%
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
2023-02-24 19:19:28 +08:00
Zaiyue Xue
d4dbf039ea Fix b/270656372 unit test failure.
Failed test: sendBatteryEntryData_nullBatteryUsageStats_sendFakeDataIntoProvider

Bug: 270656372
Fix: 270656372
Test: presubmit
Change-Id: Idd1b3be07ec72c3cf7050b96e5320d67dcdc5463
2023-02-24 19:13:50 +08:00
TreeHugger Robot
fa57dd3f2e Merge "[Settings] Re-enable previous work on data saver" into udc-dev 2023-02-24 10:15:32 +00:00