Jason Chang
fac5d59f1c
Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6
am: 9b94df1d40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828
Change-Id: Ib0f3de4392a5f7fbf64aa405699358a34b3976dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 15:16:55 +00:00
Jason Chang
9522a44bb6
Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev
2023-03-18 14:10:58 +00:00
Jason Chang
848973d300
Fix the Fingerprint enrollment page's title text creates a truncate
...
problem when it needs three lines on the R4 device
Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.
Bug: 269437675
Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.
2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.
3. Check the UI if it has been fixed.
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"
Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
Kweku Adams
7c82ea06a2
Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19
am: eaba347a70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646
Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:45:56 +00:00
Kweku Adams
9a087d6c19
Merge "Revert "Remove duplicate strings."" into udc-dev
2023-03-16 20:14:16 +00:00
Matías Hernández
25514d5380
Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3
am: d0db72339d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305
Change-Id: I1240d0ea17e6fff1a9f15a3ec0bd215987c57214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 17:00:57 +00:00
Matías Hernández
08893ed0b3
Merge "Refresh the app's "Conversations" list when there are none" into udc-dev
2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034
Refresh the app's "Conversations" list when there are none
...
Also hide the header in that case (simiarly to bubbles).
Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
2023-03-16 15:07:13 +01:00
Lifu Tang
caa1b51ef2
Revert "Remove duplicate strings."
...
Revert submission 19748582-settings_yesno
Reason for revert: Common strings in English could be translated into different strings in other languages.
Reverted changes: /q/submissionid:19748582-settings_yesno
Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
Julia Reynolds
686e7169ca
Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b
am: 84671635cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168
Change-Id: I0531dfd13ac5a1639275fadd3432fedf893a1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:37:08 +00:00
Julia Reynolds
068a55384b
Merge "Reduce jank when revoking notification permission" into udc-dev
2023-03-15 14:50:07 +00:00
Julia Reynolds
a331c50b53
Reduce jank when revoking notification permission
...
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields
Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
Jason Hsu
c2dffa7aa4
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7
am: 54fffdc6ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622
Change-Id: I3d8dc59a5ade8161d2d43e6b1ee9fdf78f0bb9c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:50:52 +00:00
TreeHugger Robot
db2bd32285
Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d
am: 59b7f47307
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162
Change-Id: I95a3d90e0b6f6bcd213c11ec3c4cb33e2132a4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 12:49:19 +00:00
Jason Hsu
9f29b957e7
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev
2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d
Merge "Hide Dock speaker plays from sound pages" into udc-dev
2023-03-15 11:52:38 +00:00
Matías Hernández
6b13d794bc
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
am: be3c8b66ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900
Change-Id: Ifc5f1477f20b3c33075bc866ed473fbd5e6649b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 10:59:30 +00:00
Mill Chen
a860bf3220
Hide Dock speaker plays from sound pages
...
In order to ensure the setting only works on the analog docks, adding
the docking state checks.
Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
displayed
Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
2023-03-15 10:25:32 +00:00
Matías Hernández
2cabe8786e
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev
2023-03-15 10:12:23 +00:00
Lucas Silva
95d06ff9de
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
am: 5671ddb191
am: d17cb44367
am: c1e0f6f3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:43:16 +00:00
Lucas Silva
d17cb44367
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
am: 5671ddb191
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:39:31 +00:00
Behnam Heydarshahi
8e10c8e488
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
am: afb4dd1ece
am: a1daad718e
am: 4f3401050d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: Ia429c3c5a8520b540b542a6634316d45f5ca15d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:59:55 +00:00
Lucas Silva
5671ddb191
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:54:01 +00:00
Lucas Silva
148f1592ef
Merge "Add home controls button to screensaver settings" into tm-qpr-dev
2023-03-14 21:47:03 +00:00
Behnam Heydarshahi
a1daad718e
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
am: afb4dd1ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: I38f7acc1b1c5cbb08432d6e3b3229305da381379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 20:22:07 +00:00
Behnam Heydarshahi
afb4dd1ece
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: I60aab9b333efc5d38f0cbc6f3635948bf734091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:43:25 +00:00
Behnam Heydarshahi
17701cd976
Merge "Extend settings panel under navigation bar" into tm-qpr-dev
2023-03-14 18:54:48 +00:00
Andreas Miko
51cb60cc7c
Add setting to disable PIN animation and password am: 30bf66db42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281
Change-Id: I39f9675c5b3fc234608882780a62141061bf1e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:05:35 +00:00
Matías Hernández
0882b04ed5
Delete stuff related to removed "Conversations that can interrupt" settings
...
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
2023-03-14 16:53:53 +01:00
TreeHugger Robot
6650ee11cc
Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920
am: 19aee83def
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043
Change-Id: I5e0791ccb1a3857b6b9bea875055521c3af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 09:13:45 +00:00
TreeHugger Robot
db7e7d0920
Merge "Put Android Core Apps under System apps" into udc-dev
2023-03-14 08:14:09 +00:00
Zaiyue Xue
702921c9ff
Put Android Core Apps under System apps
...
Bug: 269188405
Fix: 269188405
Test: manual
Change-Id: Ie79cdb71c48661b6b1e90b8d0e7836269cf665e7
2023-03-14 13:53:08 +08:00
Andreas Miko
30bf66db42
Add setting to disable PIN animation and password
...
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-03-14 02:27:51 +00:00
TreeHugger Robot
c21d06d8e0
Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e
am: 7db8aed96c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791
Change-Id: I1f47e62f2673d76f7c9444cb37cf0ea55ebb039c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 10:40:11 +00:00
Zaiyue Xue
a528f1e382
Fix b/273175976: Screen time counts the time before full charge.
...
Use the raw start timestamp instead of the first timestamp in the level
map to query app usage time.
Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: Idb43b2bd5378e2f34ec722354408754f4a439c6d
2023-03-13 15:59:05 +08:00
Candice Lo
934beb4127
Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725
Change-Id: I0b61473ac3ef0a91e2ed901d7b2deb1e35268866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 07:22:21 +00:00
Candice Lo
91eab671d1
Merge "Set the settings key when the font size is changed" into tm-qpr-dev
2023-03-13 06:51:27 +00:00
jasonwshsu
052c07b4d4
Click the search result "System Sounds" will crash the Settings app
...
Root Cause: Preferences in this page need to pass CachedBluetoothDevice or will finish the page imediately
Solution: theses preferences are in device detail page which will only show when device get connected. Show them in search result is not reasonable. Remove them.
Bug: 270508779
Test: verfiy it did not show in search result
Change-Id: I866d7be158ff87343d76fa0b3173382880c4aa6e
2023-03-12 02:48:13 +08:00
Diya Bera
ab90af039c
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
am: 9a93c8a00f
am: 3a4c6feb0a
am: bee78a3d59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: I44eaa8ffc6cf0fb3ec6cabfacb1b672033fa6b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 02:46:39 +00:00
Diya Bera
3a4c6feb0a
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
am: 9a93c8a00f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 01:14:57 +00:00
Diya Bera
9a93c8a00f
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 23:26:58 +00:00
Vania Januar
61d5568e62
Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f
am: 5b24c992e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162
Change-Id: I55e5d977c94731ee859bdab9323db620edbba7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 18:59:42 +00:00
Behnam Heydarshahi
806297f85c
Extend settings panel under navigation bar
...
The panel used to sit above the navigation bar. Now it extends down all
the way to the edge of the screen.
Bug: b/250484565
Test: make ROBOTEST_FILTER=SettingsPanelActivityTest RunSettingsRoboTests -j40
Test: Manual. When volume panel is opened, verify that it extends all
the way to the bottom of the window, instead of sitting on navigation
bar. Panel can be opened with:
adb shell am start -a android.settings.panel.action.VOLUME
Substitute VOLUME with NFC and WIFI for the other settings panels.
Change-Id: Ibae5d3602231e2309b5ff847c630a1f8c82ea355
2023-03-10 18:30:08 +00:00
Vania Januar
76452f3a1f
Merge "Show single icon layout for unknown device type in advanced header." into udc-dev
2023-03-10 18:15:37 +00:00
Junyu Lai
2937f3251a
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
am: 4beef2e82e
am: 3eb30fb31c
am: 775719b968
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: Ie2a9702e857b93b87aba055ea97172092e44d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 12:17:37 +00:00
Junyu Lai
3eb30fb31c
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
am: 4beef2e82e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I7323a6fbd1e8f7595fdb7c29e7520cff5ac12a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:48:49 +00:00
Junyu Lai
4beef2e82e
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: Ia79b5f286b4269c38fc3a2fa990615251694a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:12:13 +00:00
Junyu Lai
0da4abe1db
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 09:37:20 +00:00
Cathy Chen
8208de8cf4
Merge "Revert "Use updated lockscreen validation API in Settings.""
2023-03-10 04:25:46 +00:00
Cathy Chen
093658dbb6
Revert "Use updated lockscreen validation API in Settings."
...
Revert submission 21914417-lskf-api-review1
Reason for revert: build break
Reverted changes: /q/submissionid:21914417-lskf-api-review1
Bug: 272574624
Change-Id: I3cc824924efd239b25415e500a48bf6deb0c3c9b
2023-03-10 04:04:54 +00:00