YK Hung
d7b3234962
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3 am: 78be1d4dee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487
Change-Id: Ibffa6745725db3cca8d4005b0d3c1a5f842f5fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:59:42 +00:00
YK Hung
106ef93c1c
Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c am: 04bc21c347
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047
Change-Id: Ic61b01af3ff9207598b3ee43cc4b23765717c888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:44:31 +00:00
YK Hung
4f98350ba3
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev
2023-03-03 12:04:29 +00:00
ykhung
82d5103f07
Hide BatteryManagerPreference if there is no adaptive charging
...
Fix: 271387663
Test: presubmit
Change-Id: I12c511f17f23b21f6a584d86e854683fba037047
2023-03-03 17:46:27 +08:00
YK Hung
8efe31900c
Merge "Update the battery saver scheduler string" into udc-dev
2023-03-03 05:42:08 +00:00
ykhung
b25a824f50
Update the battery saver scheduler string
...
Fix: 266030870
Test: presubmit
Change-Id: I271f02b6a6044ba39d23e9ad1eb1decebe4eec85
2023-03-03 12:16:29 +08:00
Diya Bera
2cf85af3d0
Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994 am: 4afe665577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408
Change-Id: I103292554e98ea2fd5a3fdd3f09f644bbf19ad80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 20:28:01 +00:00
Diya Bera
4c3ac9b994
Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev
2023-03-02 19:09:23 +00:00
Diya Bera
aacb08b441
Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985 am: 4f9d82de86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465
Change-Id: I4f4ea29ca7080f143bc7772424c8aadaa8162d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 17:59:52 +00:00
Jason Chang
9bc3bd1b34
Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd am: 7f788db206
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459
Change-Id: I70503ccc067405ce8592e7619e25a85754f32f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 17:59:15 +00:00
Diya Bera
36e41dc985
Merge "Removed subtext from side fps enrollment flow" into udc-dev
2023-03-02 17:16:31 +00:00
Jason Chang
a441922bdd
Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev
2023-03-02 16:24:16 +00:00
Vincent Wang
71945b2919
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1 am: baa851a640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082
Change-Id: I1ff4b3ef6dbc5db91d942c034a60f1b7a42dec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 14:01:49 +00:00
Vincent Wang
98819227f1
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev
2023-03-02 12:55:19 +00:00
Vania Januar
745d4d8879
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad am: b5c70634b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463
Change-Id: Ie4522cf5b88bb8fab50deda7ab8bdbc3e929e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 12:50:42 +00:00
Vania Januar
8ba47734ad
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev
2023-03-02 11:46:58 +00:00
Vincent Wang
3ff1939b59
Fix Incorrect lottie status on the beginning of enrolling UDFPS
...
Bug: b/271209610
Test: 1. adb root
2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
3. Excute fingerprint enroll process & check the state of enroll progress is
correct
Change-Id: I3cac369e9dcf939a09dce11a7b9e96952bceeee8
2023-03-02 07:24:43 +00:00
Jason Chang
c3fae47144
(2/2) Fix No clear steps for "re-enroll face unlock
...
When the user has face id registered but failed enrolling in
device lock state, lead users directly to the confirm deletion
dialog in Face Unlock settings.
- When receiving a face id re-enroll extra intent data, lead users
directly to the confirm deletion dialog in Face Unlock settings.
Bug: 233069240
Test: manually force enrolling face id fail, then doing test steps:
1. Receive notification that face unlock needs to be re-enrolled
2. Tap it then entering device
3. Check if showing the confirm deletion dialog in Face Unlock
settings.
Change-Id: I4eb09cf4a7d92a1dd9866c5c8b938aeb8c7eddf5
2023-03-02 06:53:31 +00:00
Jason Chiu
1c4d1ca19a
Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be am: 207b47c696
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505
Change-Id: Ib8402b47391f59f505b82040fa6eebb3b4eec56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:47:09 +00:00
Angela Wang
0dc987ef80
Merge "Applies feature flag on Flash Notifications" into udc-dev am: aa9f7660c8 am: 022b41c2b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166
Change-Id: I2ff4ff52f03502e9c04d8b450970ba6e06385ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:44:58 +00:00
Jason Chiu
bfd3c051be
Merge "Eliminate the injection flicker while navigating back" into udc-dev
2023-03-02 02:34:14 +00:00
Angela Wang
aa9f7660c8
Merge "Applies feature flag on Flash Notifications" into udc-dev
2023-03-02 01:53:27 +00:00
Diya Bera
7fa342fadb
Removed subtext from side fps enrollment flow
...
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891
Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-01 23:17:27 +00:00
Hao Dong
9c1fb8d05f
Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9 am: 528bd9781e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790
Change-Id: I7f740224bb449abb3447bed86a2dd5b7a871d868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:03:13 +00:00
Menghan Li
80ba2f8f13
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef7d am: 38c447dbd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649784
Change-Id: I7f54ea498be8392e3f4008da0a91c7e5f51c72d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:56:29 +00:00
Hao Dong
b48c247ef9
Merge "Do not announce a11y move instructions in sensor area." into udc-dev
2023-03-01 22:53:23 +00:00
Menghan Li
bb5f8cef7d
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev
2023-03-01 21:30:18 +00:00
Julia Reynolds
ac3a758dba
Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f am: f0bb4e8ce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757
Change-Id: I863c9046230f6f0b27d4bfe37d1d0cd61dce2cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 19:48:17 +00:00
Julia Reynolds
a0c9ce5b2f
Merge "Remove jank on DND schedule page" into udc-dev
2023-03-01 18:43:11 +00:00
Julia Reynolds
cb6a88b862
Remove jank on DND schedule page
...
Only add/or remove preferences when absolutely needed.
Also fix a 'load data from backend' method that wasn't.
Fixes: 216747934
Test: ZenModeAutomaticRulesPreferenceControllerTest
Test: view schedules page
Test: add schedule
Test: remove schedule
Test: view schedule child page and return to schedules page
Change-Id: I237c2ca7ea89ee6e42354470a76712068a7f4dd7
2023-03-01 18:43:02 +00:00
Vania Januar
c1429bcb40
Handle DEVICE_TYPE_STYLUS in advanced details header.
...
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I725dd575ba56bf86e1336094961e769b81540479
2023-03-01 17:22:15 +00:00
Ahaan Ugale
8d9121fd5b
Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb am: bd9a87a9a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: Ic043a46c13b58770b274a66044f375de02758bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:56:07 +00:00
Ahaan Ugale
9cc184e3cb
Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: Ib174d04d8027e92e649d171cd02bfebc9d7aa94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:41:12 +00:00
Vincent Wang
069acab974
Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev am: 9c57255b39 am: 0c94e742b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659502
Change-Id: I7d2916f2bb1ce7b73efdfdca74d6fafd197065c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:22:09 +00:00
Vincent Wang
9c57255b39
Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev
2023-03-01 12:58:10 +00:00
Andreas Miko
8b71dc930d
Merge "Add setting to disable PIN animation and password" into udc-dev
2023-03-01 12:46:04 +00:00
Darrell Shi
ecc9213a45
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2 am: b319e78682
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I1349f0bc03740f277f2d7ab8e4a38fc9c1929fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:34:23 +00:00
Natnael Belay
f89a6c2ed4
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990
Change-Id: I546352a44aaf525b9819f59337658f3abdd8f77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:15:34 +00:00
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
f9a8cbe9a2
Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9 am: 0e5068fb58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267
Change-Id: I80b4128890f755c4112372e953d1d3f9fd3488b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 10:52:46 +00:00
Jason Chiu
771a0c0473
Eliminate the injection flicker while navigating back
...
For the title/summary uri, do not set the placeholder when it already
has content. This can avoid clearing the text before re-rendering.
Test: robotest, visual
Fix: 256657256
Change-Id: I0518f5247fd2acf6a5eaa63f0f363275103a79af
2023-03-01 10:02:35 +00:00
Vincent Wang
b7e04a59a8
Fix Different layout between v2 enrolling and original enrolling page
...
Bug: b/271210305
Test: 1. adb root
2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
3. Enter fingerprint enrilling page
4. Rotate device to 90 or 270 degree
5. Change the roation to 270 or 90 degree
Change-Id: Ib495bd281a208f0c13707ef6e3ed402ac418b8b6
2023-03-01 09:13:42 +00:00
Vincent Wang
8e3c46b1c9
Merge "Fix UDFPS enrolling crash" into udc-dev
2023-03-01 09:12:38 +00:00
menghanli
fdc9a1b896
Fix ClassCastException when users starts A11y vision settings from out of setup flow
...
Root cause: Launch A11y vision settings from out of setup flow would not apply setup wizard theme (SettingsPreferenceTheme_SetupWizard). This throws ClassCastException when converting the layout to support auto-switching two-panel pattern.
Solution: Only converting the layout if launched in setup flow.
Bug: 269267419
Test: Manual testing by `adb shell am start -n com.android.settings/com.android.settings.accessibility.AccessibilitySettingsForSetupWizardActivity` for out of setup flow cases & 'adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity' for setup flow.
Change-Id: I16871b2fa800dd1de539b7b4b96c32ce7b2cd5c9
2023-03-01 16:38:45 +08: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
Chaohui Wang
06f806f6cd
Merge "Fix App Info item summaries not refreshed" into udc-dev am: f74d6003ff am: bd1715e012
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647180
Change-Id: I54cf0d02cc52b8c42f61585ddc62b580b95b628a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:50:45 +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
f6bbe0cc07
Merge "[Settings] Improve logging to support issue triage" into udc-dev am: 6113725b61 am: 9e7ab494df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649741
Change-Id: Id5945a74a8519280a6618cf4d28e534ae4f0e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 05:16:02 +00:00
Bonian Chen
6113725b61
Merge "[Settings] Improve logging to support issue triage" into udc-dev
2023-03-01 03:59:03 +00:00