Treehugger Robot
276c2434b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 7ddc3feba8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135102
Change-Id: Ia66aa2f006417e2c0e97e391c60414534d0ee814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:19:06 +00:00
Bill Yi
88acc423f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4245015f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135102
Change-Id: If8bc1a24d119fd5b8aaefa36d71ee047ca3786c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:18:56 +00:00
Treehugger Robot
e9c3f3c950
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: ed84843965
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135100
Change-Id: I0c367f735bed2e33d427eb829d3c1b37d50d880b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:18:16 +00:00
Bill Yi
c994e52112
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adb91863c4
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135100
Change-Id: Ie19902fb44123c76331db3b0c0a19232fa91a075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:18:08 +00:00
Bill Yi
548ccfa180
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d141c167f0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28137698
Change-Id: Iaff5dd856bb24399bade74e4808069b1cba99702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:17:27 +00:00
Treehugger Robot
7ddc3feba8
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-03 02:54:11 +00:00
Treehugger Robot
ed84843965
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-03 02:53:31 +00:00
Treehugger Robot
d026d3fcc7
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-03 02:45:38 +00:00
Treehugger Robot
e91cfca1c2
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-03 02:45:38 +00:00
Treehugger Robot
22fc05176a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-03 02:45:38 +00:00
Treehugger Robot
a56866ddaa
Merge "Add mandatory biometric prompt to platform surfaces (2/N)" into main
2024-07-03 02:39:11 +00:00
David Lin
3ba119a90c
[automerger skipped] Merge "Fix to hide Display over other apps permission setting for the Scone application." into 24D1-dev am: d0d083621b
-s ours
...
am skip reason: Merged-In I3f306d24040f500c7fed4f44309e9f58f5f766be with SHA-1 2a3e96b4b5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28058913
Change-Id: Id193c73738fc52deccac5489f7b36ef04c27dc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 00:57:38 +00:00
Steve Statia
b7c152e85d
[automerger skipped] Fix to hide Display over other apps permission setting for the Scone am: 74670e4923
-s ours
...
am skip reason: Merged-In I3f306d24040f500c7fed4f44309e9f58f5f766be with SHA-1 2a3e96b4b5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28058913
Change-Id: Ic597b4f0b61c739496b279cf03b61e2a20cd1eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 00:57:32 +00:00
David Lin
d0d083621b
Merge "Fix to hide Display over other apps permission setting for the Scone application." into 24D1-dev
2024-07-03 00:53:42 +00:00
songferngwang
f6da87c4b2
Fix MobileNetworkSettings kotlin.UninitializedPropertyAccessException am: 083fda3673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28136379
Change-Id: Iee51185b9b81a70e3fd4cd7767e1513bb9f69b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 00:52:00 +00:00
Julia Reynolds
ce4f2e9db6
Merge "Show bundles separately from other channels" into main
2024-07-03 00:02:33 +00:00
Diya Bera
606bfb3057
Add mandatory biometric prompt to platform surfaces (2/N)
...
1. Factory reset
Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest MainClearTest
Change-Id: I7216f991a2550197c520af860da67f8452cff323
2024-07-02 20:57:43 +00:00
Yuri Lin
8a766c1b9b
Merge "Check that modes can be deleted before adding delete menu option." into main
2024-07-02 19:23:02 +00:00
Yuri Lin
2a19cc1874
Check that modes can be deleted before adding delete menu option.
...
Migrates to using MenuProvider instead of onCreateOptionsMenu, since the previous approach is apparently now deprecated.
Also wraps usages of requireActivity() so that we're sure the activity isn't null instead of potentially throwing an exception.
Flag: android.app.modes_ui
Bug: 346575126
Test: manually confirmed that manual DND is no longer deletable
Change-Id: I872f6054061c019db9a72028cc90cbb123a1cdce
2024-07-02 14:10:19 -04:00
Yalan Yiue
c291f22722
Merge "Launch oobe from Settings" into main
2024-07-02 17:22:14 +00:00
Matías Hernández
0037dfe9a9
Merge changes from topics "add-mode-dialog", "nicer-icon-header" into main
...
* changes:
Icon picker: Styling improvements
Add mode: Support for app-provided modes
2024-07-02 12:26:42 +00:00
Treehugger Robot
c2c6c5d058
Merge "Update the conditions of power plugged determination." into main
2024-07-02 11:56:53 +00:00
Yiling Chuang
318636d51b
Update the conditions of power plugged determination.
...
Under charging optimization mode, use ADAPTIVE_LONGLIFE as the additional condition to check whether a device is plugged.
Bug: 349949603
Flag: EXEMPT bugfix
Test: atest SettingsRoboTests
Change-Id: Idbdfaaa1d5c54be325b6182bcda81d4282c21ba0
2024-07-02 10:54:36 +00:00
Matías Hernández
45f1e819d3
Icon picker: Styling improvements
...
Instead of a the plain appearance of a EntityHeaderController, make the top icon bigger and use the same circled style as the choices in the list. Also highlight the current icon in the list as selected, even if it is the default for the mode type.
Also cleaned up controllers that don't need a ZenModesBackend to not receive it.
(Both of these changes also line up with the "new mode" fragment that is incoming).
Bug: 333901673
Bug: 326442408
Test: atest com.android.settings.notification.modes
Flag: android.app.modes_ui
Change-Id: I0c9f3e34019a1a6c48658933dde545ad8d7399ae
2024-07-02 12:12:02 +02:00
Matías Hernández
2639c19474
Add mode: Support for app-provided modes
...
(This completes the add-mode flow except for the choose-a-name-and-icon step for custom modes).
Bug: 326442408
Flag: android.app.modes_ui
Test: atest com.android.settings.notification.modes
Change-Id: I7aceec01ed54d804bcac53d932277c243c1f81bf
2024-07-02 12:09:40 +02:00
Treehugger Robot
62db4b3a4d
Merge "Add mandatory biometric prompt to platform surfaces (1/N)" into main
2024-07-02 02:50:08 +00:00
Bill Yi
4a58c5d213
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I494efeb54bf966c185541e08fc369e4b5a51c2a8
2024-07-01 19:05:52 -07:00
Bill Yi
2c4245015f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib06a8a8e61cb568f14a78675a6b647d101f0e500
2024-07-01 19:03:47 -07:00
Bill Yi
c6dc59e1a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I041b3dffa4ff1541837e4d6a552170888c21808f
2024-07-01 19:01:41 -07:00
Bill Yi
1fd1201d42
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I00511e116b9ca82ff0e69e1c919c3cceafc35935
2024-07-01 18:59:12 -07:00
Bill Yi
adb91863c4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib378e8f781250b9c4319440483f8e37e1d71acf8
2024-07-01 18:57:41 -07:00
Bill Yi
d141c167f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac0048ec09af4267bd4041ed2c9f4eb831fd5f9c
2024-07-01 18:56:06 -07:00
songferngwang
083fda3673
Fix MobileNetworkSettings kotlin.UninitializedPropertyAccessException
...
Bug: 332477183
Test: atest MmsMessagePreferenceControllerTest
Change-Id: I849ca0f333f5246d73192ae4180b3f3ce3946d61
(cherry picked from commit 34cec1389e
)
2024-07-02 01:05:11 +00:00
Diya Bera
049de84f2d
Add mandatory biometric prompt to platform surfaces (1/N)
...
1. Face settings
2. Fingerprint settings
3. Change device credential
Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest UtilsTest
Change-Id: I69778d1733ea9fb312e7c26ae0fa23b6008dde5d
2024-07-01 21:35:19 +00:00
Richard MacGregor
90d327f014
Merge "Cleanup privacy hub related flags" into main
2024-07-01 20:53:59 +00:00
Alina Zaidi
50e0a53b1c
Merge "[Dev option] Add a dev option to enable DW." into main
2024-07-01 19:54:09 +00:00
Steve Statia
74670e4923
Fix to hide Display over other apps permission setting for the Scone
...
application.
Bug: 349195999
Test: manually testing that the setting is removed from Adaptive
Connectivity Services advanced settings page.
Change-Id: I3f306d24040f500c7fed4f44309e9f58f5f766be
Merged-In: I3f306d24040f500c7fed4f44309e9f58f5f766be
2024-07-01 19:28:06 +00:00
Alina Zaidi
d98058c4b7
[Dev option] Add a dev option to enable DW.
...
Default value of this dev options solely depends on
enable_desktop_windowing_mode, which is intended
Toggle is shown only if DW is eligible on device
Currently this option only overrides features guarded by
enable_desktop_windowing_mode, later on it will be used to override a
few other DW features
Test: Added tests. Locally tested CUJs
Bug: 348186127
Bug: 348193756
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: I1c1f946b586a5ca0440b29879925ba1a624717aa
2024-07-01 17:23:20 +00:00
Steve Statia
d26521f7bb
Merge "Fix to hide Display over other apps permission setting for the Scone application." into main
2024-07-01 17:18:23 +00:00
Julia Reynolds
2956baaf51
Show bundles separately from other channels
...
Fixes: 346612561
Test: BundleListPreferenceControllerTest
Flag: android.service.notification.notification_classification
Change-Id: I2371219822f6a777788147e8249ca1e3b29d40ba
2024-07-01 12:56:41 -04:00
Yuri Lin
3731d3e8ee
Merge "Link to app-provided configuration intent for app-owned rules." into main
2024-07-01 16:22:16 +00:00
yyalan
dc9701f427
Launch oobe from Settings
...
Bug: 344860480
Flag: com.android.systemui.shared.new_touchpad_gestures_tutorial
Test: Manual
Change-Id: Iabc155d2f99717c6489308ffb1e63ef4e59f0332
2024-07-01 15:35:55 +00:00
Yuri Lin
21539cd2be
Link to app-provided configuration intent for app-owned rules.
...
If there is no valid intent, the automatic trigger preference is disabled.
Flag: android.app.modes_ui
Bug: 341961712
Test: manual (for Bedtime & Driving modes), ZenModeSetTriggerLinkPreferenceControllerTest
Change-Id: I673792effb3cfdcaaa7cf85adfb55a93b44dcc86
2024-07-01 14:50:35 +00:00
mxyyiyi
a954e914dd
Add a flag to protect overwrite app optimization mode to restricted mode.
...
- Skip set app optimization mode to restricted if the flag disabled.
Bug: 348192536
Fix: 348192536
Test: atest
Flag: EXEMPT bug fix
Change-Id: I92d320ce1edfe9b7044afdcd058651b0d54bd6bd
2024-07-01 17:38:50 +08:00
YK Hung
90acfa757a
Merge "Exclude charging period when calculate the reattribute duration (5/5)" into main
2024-07-01 09:11:31 +00:00
SongFerng Wang
183a191cbf
Merge "Add condition for askEveryTime of SMS at Primary Sim" into main
2024-07-01 08:01:50 +00:00
YK Hung
29f73d68fe
Exclude charging period when calculate the reattribute duration (5/5)
...
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: Icc9a475a71f189e72bf06f9a0b4c23380a90a603
2024-07-01 06:34:46 +00:00
Treehugger Robot
1d838f62ea
Merge "Fix UI issues in localization" into main am: ce20ff98e3
am: 97f101474a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3151118
Change-Id: Ie31bd52681f014bc6166ab0409cdf2ec55b2f0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-28 22:43:41 +00:00
Treehugger Robot
97f101474a
Merge "Fix UI issues in localization" into main am: ce20ff98e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3151118
Change-Id: If588199369afe82c6c84a1772bba2462997a70b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-28 22:20:43 +00:00
Steve Statia
2a3e96b4b5
Fix to hide Display over other apps permission setting for the Scone
...
application.
Flag: EXEMPT bugfix
Bug: 349195999
Test: manually testing that the setting is removed from Adaptive
Connectivity Services advanced settings page.
Change-Id: I3f306d24040f500c7fed4f44309e9f58f5f766be
2024-06-28 22:12:50 +00:00