Treehugger Robot
6acaa589af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8499f60001
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210364
Change-Id: Ia8018f620ec8e997fdc290e6fd6de591e7ed00bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:13 +00:00
Bill Yi
d212cbcb76
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb46b1dc9c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210364
Change-Id: I7ac7bad0e4ef2f48dcf602119c426ddaa9eebb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:08 +00:00
Treehugger Robot
73e7ef15d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 19edd63f45
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210265
Change-Id: I975635f963db510f7e739cc572bda10eb5a3b567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:04 +00:00
Treehugger Robot
1380a1902d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1dbe396041
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210362
Change-Id: Ib43d8abaca48264804888ccea59423052450497f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:03 +00:00
Bill Yi
e82b3fc4c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86a87925f6
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210265
Change-Id: I3e65ca31cd35a867936bed3c46dbca9a70f2120d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:08:54 +00:00
Bill Yi
d87f6e805f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccebfb91db
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210362
Change-Id: I54bf2e3d6fa4ea7d0eeb2c2c6c552cb407d42509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:08:51 +00:00
Bill Yi
e22ee4ed09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edc6ee27c2
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210263
Change-Id: I1bd28fd555677ca74fe795a1085dfd42b895685b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:08:44 +00:00
Bill Yi
04806523b9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d769e1a8d7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210361
Change-Id: I6fba407df34e611b6eb76614a12c1df86ce2f057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:07:34 +00:00
Treehugger Robot
8499f60001
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-09 19:50:29 +00:00
Treehugger Robot
19edd63f45
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-09 19:50:29 +00:00
Treehugger Robot
1dbe396041
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-09 19:50:16 +00:00
Treehugger Robot
e2bad9251a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-09 19:32:21 +00:00
Treehugger Robot
b108711a81
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-09 19:32:21 +00:00
Treehugger Robot
9b513c37e4
Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb
am: f7486fc4a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058
Change-Id: Iac64aee8edc5948efc8ba9b8191c2604befbcfbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 17:56:25 +00:00
Treehugger Robot
f7486fc4a5
Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058
Change-Id: Ia7ae95a0988aa1e63669af5485ca25ef31993c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 17:40:34 +00:00
josephpv
20758d5cfe
Fix RTL alignment issue in private space education
...
With this change the RTL mirroring issue is fixed in the private space
education screen where the icons are aligned to the right for languages
requiring mirror support.
Screenshot:
go/ss/7AuF2HYsmTVaW5w.png
go/ss/HazpLiDH92X2X26.png
go/ss/4TueVkQcKmKZrAL.png
Flag: EXEMPT resource only update
Bug: 351141472
Test: Manual
Change-Id: I33d30ad425ae17e7a8653bc6545f640ee5d09706
2024-07-09 17:33:35 +00:00
Treehugger Robot
9a492ca3cb
Merge "Repost PageAgnostic mode notification when dismissed" into main
2024-07-09 17:27:16 +00:00
Julia Reynolds
f9ce78e87b
Merge "Create a new link preference for priority modes entry" into main
2024-07-09 13:17:06 +00:00
Treehugger Robot
b519dc9f32
Merge "Fix display problem in the freeform mode" into main
2024-07-09 13:08:55 +00:00
Treehugger Robot
fbfacbb9e5
Merge "FRP bypass defense in App battery usage page" into main
2024-07-09 11:46:46 +00:00
Zoey Chen
f7b2f0a19c
Merge "[Settings] Add pref key for metrics" into main
2024-07-09 11:43:42 +00:00
Alina Zaidi
9233fe7b46
Merge "[Dev option] Use DesktopModeStatus and ToggleOverride from wm/shell in Settings DesktopModePreferenceController" into main
2024-07-09 10:04:13 +00:00
Haijie Hong
2e3d477a3f
Merge "Add ring indicator for battery level" into main
2024-07-09 08:44:48 +00:00
Yiling Chuang
419a6a9079
FRP bypass defense in App battery usage page
...
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.
Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix
Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
2024-07-09 08:13:49 +00:00
Zoey Chen
21a54d0343
[Settings] Add pref key for metrics
...
Bug: 349749793
Test: manual
Flag: EXEMPT resource only update
Change-Id: I367a42d023b2a1b879130e63205e3f63365a4a86
2024-07-09 06:38:10 +00:00
Matías Hernández
bb41777f87
Merge "Add mode: Choose name and icon for new custom modes" into main
2024-07-09 02:20:07 +00:00
Daniel Norman
0771fd8a9e
Uses a custom state description for the Audio Balance seek bar.
...
This makes the seek bar more informative for a user of a screen reader
or other accessibility service. See context in b/319575109#comment7.
Bug: 319575109
Flag: com.android.settings.accessibility.audio_balance_state_description
Test: Use TalkBack to observe the state description while moving the
seek bar.
Test: atest BalanceSeekBarTest
Change-Id: I7be15b26116f83854efe69d6b0560edde946daf5
2024-07-08 23:30:41 +00:00
Jason Chang
f0bd2d38d4
Fix the wording order of personal and work are different in the
...
device unlock settings
Change the wording order of Face and Fingerprint for work profile.
Flag: EXEMPT bugfix
Bug: 342356302
Test: Build ABTD ROM and check the wording order of Face and
Fingerprint for work profile.
Change-Id: I7e68bfcb411f70d6dd9a2a2f7d3a6a976bb9dacf
2024-07-08 16:46:06 +00:00
Treehugger Robot
27b5476bbf
Merge "Fix FP enroll page content overlapped by buttons" into main
2024-07-08 16:34:41 +00:00
Alina Zaidi
b456e84570
[Dev option] Use DesktopModeStatus and ToggleOverride from wm/shell in Settings DesktopModePreferenceController
...
Test: Added tests
Bug: 348193756
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: I0dc3c62df992a2454bd7c1fc239302489107ae59
2024-07-08 16:07:43 +00:00
Treehugger Robot
d12a36466d
Merge "Fix test failures in deviceinfo" into main
2024-07-08 08:35:05 +00:00
Yiling Chuang
e24c5f37d2
Fix test failures in deviceinfo
...
Fixes: 315267179
Flag: EXEMPT bugfix
Test: atest SettingsRoboTests
Change-Id: I9858374fe101ee5908e16104ed7b4ca6af0308cd
2024-07-08 07:43:49 +00:00
Bill Yi
cb46b1dc9c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57934a134eb8e6ac59959064bccd46454f8b728e
2024-07-07 22:54:50 -07:00
Bill Yi
8607e0fe68
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I233a7a0e24aaed041ce66e1806453a8cbcb79910
2024-07-07 22:53:53 -07:00
Bill Yi
86a87925f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I454de116b97e0c4d3e0ea820c1c02e23a438af95
2024-07-07 22:51:33 -07:00
Bill Yi
5bc09d3072
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I47924d0114fe9b0a23a6f116299d681dea1dd8ca
2024-07-07 22:49:43 -07:00
Bill Yi
edc6ee27c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39d8a61dbce46d07a2989d9e2807e46e8842ad3d
2024-07-07 22:48:09 -07:00
Bill Yi
e522b250fc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0488dd6026ee5d8245c2664eeb2b02a1c5f002f4
2024-07-07 22:47:16 -07:00
Bill Yi
ccebfb91db
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I25aed55c2ff602d0c87f5dff1a89f984a568638c
2024-07-07 22:45:39 -07:00
Bill Yi
d769e1a8d7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72f168896fd064fc07902b1b651b3c7ea96a1402
2024-07-07 22:44:08 -07:00
Shaowei Shen
76129cbe23
Merge "[Touchpad Setting] Hide Touchpad page when there's no connected one" into main
2024-07-08 03:55:14 +00:00
YK Hung
f8b46c01e8
AiCore reattribute feature
...
Bug: 346706894
Bug: 344438848
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
Merged-In: Icc9a475a71f189e72bf06f9a0b4c23380a90a603
2024-07-08 02:46:56 +00:00
Matías Hernández
574fcaf1b2
Add mode: Choose name and icon for new custom modes
...
This also unifies the "icon picker" screen with the new "add mode" screen since in both cases we want to edit name and icon together (and not save updates until the user confirms).
Bug: 326442408
Bug: 346278854
Test: atest com.android.settings.notification.modes
Flag: android.app.modes_ui
Change-Id: I8a9d07ba0b6c55f3abc1b9884f278d51d178dc83
2024-07-06 22:12:58 +00:00
Matías Hernández
606f9b1727
Merge "Use a temporary summary in the "Apps that can interrupt" preference" into main
2024-07-06 10:42:23 +00:00
Matías Hernández
ec376bcfce
Use a temporary summary in the "Apps that can interrupt" preference
...
We load the list of apps in a background thread, so getting that string later was causing the preference to increase in height, with an annoyingly noticeable animation. Having a placeholder test ensures this doesn't happen (and actually loading is pretty fast, so this text lkely won't even be visible).
Fixes: 347744856
Test: atest ZenModeAppsLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: I4f9f60104fb8b0abbc7c4279b87daafac481e98a
2024-07-05 17:36:47 +02:00
Ioana Alexandru
5c642663de
Merge "Consolidate statusbar/notification and notification/" into main
2024-07-05 08:35:54 +00:00
shaoweishen
60eae5e01c
[Touchpad Setting] Hide Touchpad page when there's no connected one
...
The option for entering page already has complete check condition.
Update the same check logic to isSeachable in setting page to hide
page when there's no touchpad connected.
Also apply check on trackpadTouchGesture.
Test: verify on device
Bug: 346497646
Flag: EXEMPT bugfix
Change-Id: I1730c7bd1fd2615dc1725ec0cc32293254e5b54a
2024-07-05 08:18:48 +00:00
Sunny Shao
79c69fccd1
Fix display problem in the freeform mode
...
Fixes: 347373574
Flag: EXEMPT bugfix
Test: manual test
Change-Id: Ia1333474059988a524fc0ca49e7062b51da2cc37
2024-07-05 15:41:57 +08:00
Treehugger Robot
9b192cf15b
Merge "Settings: fix unexpected routing selection" into main am: a02b1c3aa2
am: 226c0d5487
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160065
Change-Id: I1fa2395682dfb3b94b2cc1b8fa269fa8e17b305d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-05 07:36:20 +00:00
Treehugger Robot
226c0d5487
Merge "Settings: fix unexpected routing selection" into main am: a02b1c3aa2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160065
Change-Id: I6ccacc71a9848cc2f030fb2612f3762172e893ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-05 07:17:38 +00:00