Zaiyue Xue
7627a0e575
Fix b/265409044: The battery usage page auto goes up when coming back from app details page.
...
screen record after fix: https://drive.google.com/file/d/1a2vvMIYLSalXfM8-004drKBWK2LcK_F9/view?resourcekey=0-A586Sk0yx-OnErHkd5EgjQ
Bug: 265409044
Fix: 265409044
Test: manual
Change-Id: I7a58c9081250936de27a4970d0a9708168138fb9
2023-01-13 20:41:26 +08:00
Betty Chang
fb8a7a3b55
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
am: c985a6d47d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: Ia5d97a91a9a52b044b7d016b80b67cf094d45acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 12:32:42 +00:00
Jason Chang
bfa35a7b1e
Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev
2023-01-13 12:31:40 +00:00
Betty Chang
c985a6d47d
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 11:58:35 +00:00
Jason Chang
8c5bcaa374
(2/2) Fix settings face enrollment UI layout problem
...
To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button
Bug: 260653042
Bug: 263065347
Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"
Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
2023-01-13 10:48:50 +00:00
Betty Chang
d7e16c22f6
Merge "[LE Audio] To add the vibrate when the scan is successful"
2023-01-13 10:34:12 +00:00
Ayush Sharma
f857fd4357
For top layout use FrameLayout than GlifLayout
...
In these xml files we are having nested GlifLayout, that I think
messes up the UI
Bug: 237169259
Test: Manual
Change-Id: I9df8b1b7b5c19c61b92b30432bc7d78325876425
(cherry picked from commit 3dcf68f321
)
Merged-In: I9df8b1b7b5c19c61b92b30432bc7d78325876425
2023-01-13 09:51:21 +00:00
TreeHugger Robot
30317dd2b9
Merge "Query usage event for a longer time period and then trim the usage events outside the expected period to make sure the app usage calculation near the boundaries are correct."
2023-01-13 08:36:24 +00:00
Ankita Vyas
7bad1241a4
AppClone: Add animation and description text in Cloned Apps page.
...
Bug: 265251138
Test: manual and robo
Change-Id: I623c01fc74c1ac162917fce8b2fda9754b0a2b4b
2023-01-13 08:12:18 +00:00
Xin Li
8fddc2a74a
[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5482fb0301
-s ours
...
am skip reason: Merged-In Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0 with SHA-1 2681d8cc05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20956124
Change-Id: Iffc03515779701859b256b2b5384612eaa45a63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 08:08:01 +00:00
Kuan Wang
4a6b26558d
Query usage event for a longer time period and then trim the usage
...
events outside the expected period to make sure the app usage calculation near the boundaries are correct.
Test: make RunSettingsRoboTests + manual
Bug: 264858898
Change-Id: I9f6aa5a09a537f48a26a08b7dff8ae81e8a16e2a
2023-01-13 15:17:27 +08:00
TreeHugger Robot
eac5326a16
Merge "Add toggle for Wi-Fi hotspot"
2023-01-13 06:25:47 +00:00
Sunny Shao
042f3aebfb
Remove additional and unused action
...
Fixes: 265276395
Test: compilation
Change-Id: Ib8e5e22ebb9f4742a60fcc28643dc5640b4db1e2
2023-01-13 13:43:42 +08:00
SongFerng Wang
fe5978cde1
Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"
...
This reverts commit 078ecbd765
.
Reason for revert: The in-market device have error by some unknown reasons at b/264371574. To revert it, then the settings wait the 25s, it can protect the system has enough time for enabling esim.
Change-Id: Ic17380f549c764306851ad5cba6360f68df9b9b5
2023-01-13 04:18:34 +00:00
Milton Wu
af880ef718
Add FingerprintEnrollProgressViewModelTest
...
Bug: 259664912
Test: m RunSettingsRoboTests
ROBOTEST_FILTER=FingerprintEnrollProgressViewModelTest
Change-Id: I10605a9f179c20c3a1ba23373485855a0cbb7099
2023-01-13 11:57:59 +08:00
Android Build Coastguard Worker
d382eee7e9
Merge cherrypicks of ['ag/20919289'] into tm-qpr2-release.
...
Change-Id: I93213ba09a855945301556ad149220d360ff8f29
2023-01-13 03:02:28 +00:00
Diya Bera
5b9653f581
Fixes background color in SUW fingerprint enrollment
...
Test: Manual (Enroll fingerprint in SUW, background color remains the
same)
Bug: 246231650
Bug: 250464527
Change-Id: Iffd1543d8b230199c3b925c6538bd418a381c96a
(cherry picked from commit 00dfcd83dc
)
Merged-In: Iffd1543d8b230199c3b925c6538bd418a381c96a
2023-01-13 02:59:44 +00:00
TreeHugger Robot
8fce459806
Merge "Fix settings crash"
2023-01-13 02:51:11 +00:00
Joshua McCloskey
a11c6b5a64
Fixed additional lottie flicker in fp settings.
...
Test: Verified in fingerprint enrollment, the lotties no longer flicker
Fixes: 265194279
Change-Id: Ia88207ce7e520c6c180acdc21d03350976c10b17
2023-01-13 02:50:21 +00:00
changbetty
ca475a5d37
[LE Audio] To add the vibrate when the scan is successful
...
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
2023-01-13 02:30:23 +00:00
Jing Ji
c29bd1cdc1
Merge "Add a feature flag for the special access to the long background task"
2023-01-13 01:10:15 +00:00
TreeHugger Robot
66394f56e2
Merge "Fix checkcolor_hook error"
2023-01-13 01:02:41 +00:00
Weng Su
f779e6c9d3
Add toggle for Wi-Fi hotspot
...
- Add Wi-Fi hotspot toggle with vertical divider
- Disable preference and toggle when Data Saver is enabled
Bug: 245569117
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
atest -c TetheringManagerModelTest
Change-Id: Ic2baf7d3d0a7bf9527da38d24ecc511b7c91265a
2023-01-13 08:52:54 +08:00
Ling Ma
d6b117fcdf
Add dialog for enable auto data switch
...
When user activate multi-SIM and suitable to enable auto data switch,
prompt the user when a dialog following choosing default data sub.
UX: https://docs.google.com/presentation/d/1G6bcPoJUW-YcBzpQXAQLecY3nu69rLlCLQBfpAvVD7c/edit?resourcekey=0-qPkfUNLQ2Wfz2pq3V_6MZA#slide=id.g1c25e24318e_0_0
Test: manual verified the dialog buttons following simListDialog +
specific dialog
Bug: 260659244
Change-Id: Ib35f2d08093c2dd79036034bbfe0efaaa0be3162
2023-01-12 15:24:40 -08:00
Taran Singh
b21a885592
Toggle Stylus handwriting default ON
...
Enable Stylus handwriting to ON in developer options. This reduces one
step to dogfood the feature.
Bug: 210039666
Bug: 219777744
Test: atest StylusHandwritingTest
Change-Id: If35528b2faf3a22b58b23584809bded3ce3bc7e8
2023-01-12 22:41:56 +00:00
Behnam Heydarshahi
1c3a9421a7
Always index RingerModeAffected slices
...
When indexing slices, SliceDataConverter makes an exception for
RingerModeAffected slices. They can be !isAvailable() but still be
added to the list of slices.
Bug: 259084354
Test: Manual. Enable systemui DeviceConfig flag
volume_separate_notification. Open volume dialog.
Verify that ring & notification slice is split into ring slice and
notification slice.
Change-Id: Iaab30154025cd082b388c412da6ecd573b8d6fcf
2023-01-12 22:25:27 +00:00
Diya Bera
38ad4e2a07
Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae
am: fd252fff94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301
Change-Id: I5281b559589fcd6fdeaea49a256af4b6eea8936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 21:15:29 +00:00
Diya Bera
fd252fff94
Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301
Change-Id: I9edcd73ab9f7ab08d1f4305ecda92090171b140a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 20:03:22 +00:00
Mady Mellor
1ddb83a8cb
Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032
am: 599d990913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039
Change-Id: I2065ec218f8fa9d4c83abad8a18f1d011e24d61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 19:58:19 +00:00
Diya Bera
6c703e12ae
Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev
2023-01-12 19:30:05 +00:00
Mady Mellor
599d990913
Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039
Change-Id: Ie1a6ecdc7b6a896c5839bda765a3e2ad359dd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 18:49:52 +00:00
Mady Mellor
912ace3032
Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev
2023-01-12 18:16:04 +00:00
Becca Hughes
e1608b369f
Fix settings crash
...
Fix settings crash when dialog is shown
becuase the wrong fragment manager is
used.
Bug: 264939770
Test: unit test and test on device
Change-Id: I5f4c04740058baaa1c96a7108dc4b08b3e467fb8
2023-01-12 18:10:24 +00:00
Kevin Liu
b37f8bf1b1
[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: 521278a00d
am: 2d0ad56211
-s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20838198
Change-Id: Ifa0094671af47968f9ba98c78812b9be423cf0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:20:47 +00:00
Automerger Merge Worker
0913e13c00
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9dc317eea
-s ours"
2023-01-12 17:18:41 +00:00
Behnam Heydarshahi
74f725254e
Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537
am: 93ae531273
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100
Change-Id: Ifc2e24c703199737d647f55f8615d83795630477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:18:05 +00:00
Behnam Heydarshahi
f1ad9691f2
Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev am: 9d63dc8b6e
am: 811fb9fa8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806122
Change-Id: I9bcb0251705d7a6e39dca684d80842be67cf26da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:17:05 +00:00
Bill Yi
3faa87b55f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9dc317eea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20907727
Change-Id: I6065a3f5ce80c50659af7076c59cd8f343ca40b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:17:01 +00:00
Betty Chang
c71aaba7a2
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832
am: feb6121894
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: I6420114f63d291c9377e7a8d760364b69a468f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:05:04 +00:00
changbetty
38b8de011e
[automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492
am: d3e33ced2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: If6cedfda15b48ea845583d684e107ebac6dab4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:05:01 +00:00
Yanting Yang
d224e3a434
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours am: a617639496
-s ours am: 8c70085bab
-s ours am: b1391d7eb2
-s ours am: b842d569bf
-s ours am: d5ae56c0ae
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: Icc0e3c6e120bf81b46973a84361f5a6e78d4f537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:04:50 +00:00
Yanting Yang
3df3b2ec68
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334
-s ours am: 3594b1e412
-s ours am: f3d990e36d
-s ours am: 9038a26635
-s ours am: 36a4373792
-s ours am: 87d4b0e0d2
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871703
Change-Id: I85561a71a61a95d617eb1decb0d11c5cd72b0b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:04:38 +00:00
Yanting Yang
f7dd4e90f0
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada
-s ours am: 1b30190fe1
-s ours am: adc9a200ac
-s ours am: 46c8caa6cc
-s ours am: 41310e1170
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872582
Change-Id: I8db63b91eb5a7b86cfa8045f7433da69dd6e1a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:04:28 +00:00
Yanting Yang
1945ef6790
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9
-s ours am: f54f57f1a7
-s ours am: 3fefcb236a
-s ours am: 2672815f16
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871684
Change-Id: I73b662dfe897d28d7a497df537f857697a6ca1ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:04:19 +00:00
Yanting Yang
3f4bf61e7a
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2
-s ours am: 33186e2f03
-s ours am: b656b12a39
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871683
Change-Id: I4edb8ad29c3974e0b95e7e6cb010d30254a3c217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:04:08 +00:00
Yanting Yang
debd61b979
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe
am: c6fbd37612
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 86914bedc8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871702
Change-Id: Icdd88a832fa8248bc2526d78c04cabd65dfb057b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:03:15 +00:00
Bill Yi
3e09bc2e2b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: fc6fc6cc49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853555
Change-Id: I7c0d2b747129f21791a3a2efcef8026ace5c0bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:01:19 +00:00
Bill Yi
19aa6663c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86ae4bb50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853555
Change-Id: I0dd328e155464cb2973ac6742f408f0615f9e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:01:13 +00:00
Bill Yi
7758f92b72
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 054685b7d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853554
Change-Id: Ief584179d79b50c7846870ec8b8073e597230a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:00:36 +00:00
Tsung-Mao Fang
4a20e4f63c
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours am: ac092ac06f
-s ours am: a5904fed59
-s ours am: 322e0d684d
-s ours am: 6800574d8d
-s ours am: be9c190f97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: If05529aba8ac4c6d8ed73c5d46eca462fbd9497a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 16:45:04 +00:00