Treehugger Robot
0c7896c4c8
Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5
am: 8f77a3bfb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412
Change-Id: I37d172d2e6aa6f988a891fa2e26112baa332e033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 11:30:45 +00:00
TreeHugger Robot
f67ff73931
Merge "[Settings] Set callback as default"
2023-02-16 11:08:32 +00:00
Treehugger Robot
8f77a3bfb4
Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412
Change-Id: I1b9b9ff95026831fec9329ccfefeb6096e984389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 10:46:42 +00:00
Treehugger Robot
dcb1dbc7f5
Merge "Make Media Vibration setting configurable"
2023-02-16 09:56:25 +00:00
Brian Lee
a56e6c8768
Merge "Support remote device credentials validation in UI."
2023-02-16 09:42:40 +00:00
TreeHugger Robot
e45f1af4ea
Merge "Fix textview overlap after font size modify to maximum"
2023-02-16 08:50:01 +00:00
David Magno
4e816be889
Make Media Vibration setting configurable
...
Add a configuration boolean to control whether or not to display
Media Vibration switch (default: display the switch).
This configuration can then be overriden by OEMs for devices
that don't support media vibration.
Bug: 268657239
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.accessibility.MediaVibration"
Change-Id: I91857fbb04abc97b290559895010c3cbeef7ebab
2023-02-16 09:49:01 +01:00
Betty Chang
4afd4c639c
Merge "To center the text of the header title"
2023-02-16 07:24:16 +00:00
Brian Lee
d4f8e5802e
Support remote device credentials validation in UI.
...
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 258505917
Change-Id: Ifb9f15728eb8396b34c844d28f71a8e6e1aad837
2023-02-15 23:23:17 -08:00
Zoey Chen
93185b6ce0
[Settings] Set callback as default
...
Bug: N/A
Change-Id: Iff8ef64558db63856a9982ae0d26427f8be7b60c
Test: manual
2023-02-16 07:00:04 +00:00
menghanli
3fba0ee402
RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources
...
Root cause: Portrait mode does not always respect the sw600dp qualifier and instead uses the phone (default) resources.
Solution: Using the product to customize the tablet and phone cases is better way than using the configuration qualifier.
Bug: 269130587
Test: Manual testing
Change-Id: I90cc44f1e9bccf8950a4d89f70119ba5e3c0bfdc
(cherry-pick of commit bea25c7513
)
2023-02-16 05:59:01 +00:00
Charles Chen
1881749f09
Make Settings show in two-pane on portrait tablet
...
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
(cherry picked from commit cf3199fc9e
)
2023-02-16 05:32:44 +00:00
Arc Wang
bfc95e7ba1
Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property
...
Future WM Jetpack library updates will ask for the property to
enable ActivityEmbedding feature.
Bug: 264733035
Test: build pass
Change-Id: I0f5e5a10250049fb9425eac7c113b803b6701cc7
Merged-In: I0f5e5a10250049fb9425eac7c113b803b6701cc7
(cherry picked from commit cf4ee7be4c
)
2023-02-16 05:30:08 +00:00
Menghan Li
bc25127a18
Merge "Fix certain Accessibility Settings subpages use wrong resources"
2023-02-16 05:26:18 +00:00
TreeHugger Robot
6f90d1afcc
Merge "Re-add WiFi Calling preference controller"
2023-02-16 03:42:15 +00:00
changbetty
e162526005
To center the text of the header title
...
Bug: 261162446
Test: Manual test
Change-Id: Iae34d44aee1a6d55ba9dedef19c286fa65c27e26
2023-02-16 02:43:08 +00:00
Betty Chang
fd32cde5cc
Merge "To fix the footer link is not clickable in the Bluetooth Settings"
2023-02-16 02:27:00 +00:00
Aswin Sankar
7807138cb2
Re-add WiFi Calling preference controller
...
- WiFi calling preference controller was incorrectly removed
from MobileNetworkSettings.
- It was still accessible from Calls & SMS fragment.
Bug: 253698238
Test: Live test by flashing build on Pixel 7
Change-Id: I42b2ca26dfb0bf39ac9a0ec0107f3323d7dfc61b
2023-02-15 18:00:04 -08:00
Anvesh Renikindi
3837556871
[automerger skipped] Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev am: 217c026095
-s ours am: 120964222c
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21407399
Change-Id: I5451a89a898d9a83716cc4c4e954a6040fb1d7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 00:40:07 +00:00
Jiaming Liu
b96dc617e8
[automerger skipped] Fix build for jetpack update am: 1c0af48f8c
-s ours am: 1aca5ed787
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21407399
Change-Id: Ic22e8e4cc7b35bf679296ce0396aa76134618ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 00:39:59 +00:00
Anvesh Renikindi
120964222c
[automerger skipped] Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev am: 217c026095
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21407399
Change-Id: Ic8161e5dca42b0e4b4f0aef8042bee90d70747b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 23:51:01 +00:00
Jiaming Liu
1aca5ed787
[automerger skipped] Fix build for jetpack update am: 1c0af48f8c
-s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21407399
Change-Id: I3c21bab1c9a397ca7cb8b72fcc1927eec1d0f1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 23:50:49 +00:00
Anvesh Renikindi
217c026095
Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Fix build for jetpack update
Update ActivityEmbedding usage.
2023-02-15 23:35:17 +00:00
Joshua Mccloskey
cba4cbe23a
Merge "Dismiss dialog on acquire message event."
2023-02-15 23:22:25 +00:00
Xin Li
e82fc16e88
[automerger skipped] RESTRICT AUTOMERGE - Merge TQ2A.230305.008 am: 65d9917e8a
-s ours am: 6ef4e6bed1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21427977
Change-Id: I6a993e7a4b5d0ae633a832860f9319a1298dae35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 22:51:01 +00:00
Xin Li
6ef4e6bed1
[automerger skipped] RESTRICT AUTOMERGE - Merge TQ2A.230305.008 am: 65d9917e8a
-s ours
...
am skip reason: Merged-In I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932 with SHA-1 2ac6fc5709
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21427977
Change-Id: Id1449689909d6e3b0c755d648a26d25af75eceff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 22:04:46 +00:00
TreeHugger Robot
03403c48b3
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-15 21:38:56 +00:00
TreeHugger Robot
c094ce623b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-02-15 21:38:56 +00:00
Bill Yi
b2e272639d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 55d7faff28
-s ours am: 10ba09612f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: I655a9c6cd7ab057230a0d654bc339aba7c6c2743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:25:08 +00:00
Bill Yi
38f443fb62
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2d5a33748
-s ours am: ea62a80a18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: I3c9b5278026c12dffbdd4e8bf36838f3636e6ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:24:57 +00:00
Bill Yi
8d2a59d528
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ea0587455f
-s ours am: 4274924f76
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: Ie3555c6d6ae3b6b5a79b3008386f32be14c4d1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:24:43 +00:00
Bill Yi
78d5d2669e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e52f449fa2
-s ours am: 3cb47aa3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: Ib6708c9a5b7c8dbacae81b321b4dbdd2a355cf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 20:24:24 +00:00
Bill Yi
10ba09612f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 55d7faff28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: Iad795bcbd415cefb84037dfc20bd35f88fdac11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:47:11 +00:00
Bill Yi
ea62a80a18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2d5a33748
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21431024
Change-Id: I252b26abc8bab5d1c204b06b672633106f896aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:47:00 +00:00
Bill Yi
4274924f76
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ea0587455f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: I214216265b3ec12587957c5dfe948281fe44cc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:46:43 +00:00
Bill Yi
3cb47aa3bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e52f449fa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21430602
Change-Id: I2e1d4ee2dcef6559a41af4ab55023ebd01b21bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 19:46:25 +00:00
Bill Yi
55d7faff28
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-15 19:21:32 +00:00
Bill Yi
ea0587455f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-15 19:21:32 +00:00
Joshua McCloskey
00a2136ffa
Dismiss dialog on acquire message event.
...
Test: Verified that any acquired message dismisses the touch dialog
Fixes: 265502746
Change-Id: I4791edeb9bfdb308778136cd91205560db59f0a8
2023-02-15 18:48:14 +00:00
Henri Chataing
963519a300
Merge "Nfc: Rename system properties in Nfc settings"
2023-02-15 18:36:23 +00:00
Jay Sullivan
6ed8f2b894
Merge "[Safety Labels] Decouple safety label changes from permission rationale"
2023-02-15 18:32:43 +00:00
Derek Jedral
eb08a84437
Merge "Show CombinedBiometric if active unlock enabled"
2023-02-15 18:03:55 +00:00
Behnam Heydarshahi
b5ecd4b87d
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399
am: 3ee4929594
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549
Change-Id: Icca1292b29dc7682c36d901bce41d08f5ae3ab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 16:09:19 +00:00
Behnam Heydarshahi
d9c3cf855f
Muting ring volume slider disables notification
...
With volume_separate_notification flag enbaled, muting ring volume
slice will cause notification volume slice to gray out.
There used to be a bug in which notification slice would not get
updated in response to a change in ring volume mute/unmute broadcast.
The resulting erroneous behavior was notification slider would get to
zero but not get grayed out. To fix that bug, VolumeSliceHelper listens
to ring stream mute/unmute broadcasts and forwards them to notification
slice.
Bug: b/266072907
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|VolumeSliceHelperTest" RunSettingsRoboTests -j40
Change-Id: I2ab51f1272bf99a0c3d9ca285354052d00910c90
2023-02-15 15:43:08 +00:00
Neil Fuller
ddbbcbab5b
Merge changes Ifd96c543,I1a0faa44
...
* changes:
Further status logic tweaks
Tweak status display logic and tests
2023-02-15 15:15:21 +00:00
Behnam Heydarshahi
3ee4929594
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549
Change-Id: If4cfdeb37dbcc49ce9ec36bee690df4db1a87213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 15:08:56 +00:00
changbetty
3512374f62
To fix the footer link is not clickable in the Bluetooth Settings
...
- Links are not allowed in footer preference title now. So follow the
Wi-Fi UX design to add the string "Change". Let the user to click and
go to the Bluetooth scanninng settings
Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
2023-02-15 14:31:49 +00:00
Behnam Heydarshahi
d89de47399
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev
2023-02-15 14:28:15 +00:00
Bonian Chen
e47ba046ac
Merge "[Settings] IMEI should be enabled regardless existance of SIM"
2023-02-15 12:22:15 +00:00
Arc Wang
319cac993c
Merge "Fix crash when switching Display size"
2023-02-15 11:08:15 +00:00