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
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
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
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
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
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
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
Behnam Heydarshahi
d89de47399
Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev
2023-02-15 14:28:15 +00:00
menghanli
af1f8ed6ad
Add a done button to vision setting pages in setup flow am: 991b70c720
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425
Change-Id: Ibb2f4831810685728481e6a9ba5073c3252b9968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-15 02:33:03 +00:00
Bill Yi
e2d5a33748
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I89a9586453eee0e88d4aca8771fb8a582e2b32b5
2023-02-14 18:01:45 -08:00
Bill Yi
e52f449fa2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4134c3f26fd6779ddbc882bc377966c57570e245
2023-02-14 17:55:33 -08:00
Xin Li
65d9917e8a
RESTRICT AUTOMERGE - Merge TQ2A.230305.008
...
Bug: 264720040
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
Merged-In: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
Change-Id: I5833464626eb06a01d6979c477be98ba06827893
2023-02-14 16:31:37 -08:00
menghanli
991b70c720
Add a done button to vision setting pages in setup flow
...
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation. This change combines parts of commit 5e931b2c23
and commit dd2ec775c8
.
Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
Merged-In: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
(cherry picked from commit dd2ec775c8
)
2023-02-15 06:32:57 +08:00
Hieu Dang
c6cbe0b6ac
Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3
am: 420a8474db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645
Change-Id: I09e99a75b6509f750d938090ede17c4fe3398a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-14 02:45:29 +00:00
Jiaming Liu
1c0af48f8c
Fix build for jetpack update
...
Fix build for jetpack update
Bug: 265818545
Test: build
Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a
)
(cherry picked from commit 5a6444776a
)
2023-02-14 02:04:33 +00:00
Hieu Dang
420a8474db
Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645
Change-Id: I9e231ac0e16c8e8217be53cc89335758b14be6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-14 02:02:08 +00:00
Hieu Dang
e1e657dac3
Merge "Show Bluetooth dialog in a specific case"
2023-02-14 01:55:09 +00:00
Diego Vela
d2dfc4285e
Update ActivityEmbedding usage.
...
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796
)
(cherry picked from commit 65bb5a09f4
)
2023-02-14 00:36:20 +00:00
Behnam Heydarshahi
236bbcb8bc
Propagate mute event to both ring volume slices
...
Fix a bug where introduction of a separate_ring_volume slice meant that
the original ring_volume slice would not get notified of ring stream
muting event.
Bug: b/266855922
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=VolumeSliceHelperTest RunSettingsRoboTests -j40
Change-Id: Ifb5ebe4e7d9bde3d14336891cce3fbee167a5911
2023-02-13 14:50:27 +00:00
Jakub Rotkiewicz
2a82a4f3b1
Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91
am: bd2f353f8b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495
Change-Id: I948bc2e08e3044d20a9d3ce5b081c940bea54811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-13 14:19:30 +00:00
Jakub Rotkiewicz
bd2f353f8b
Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495
Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-13 13:35:37 +00:00
Jakub Rotkiewicz
cfde422f91
Merge "SnoopLogger: Debug enhancements added settings"
2023-02-13 13:01:01 +00:00
Jakub Rotkiewicz
5a1b8a11a6
SnoopLogger: Debug enhancements added settings
...
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4
Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
TreeHugger Robot
507631c4f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3773ae0d9f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005
Change-Id: I7a6226bafb7b3ad24c25183df2c4eda9d942bfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-11 20:32:55 +00:00
Bill Yi
9dcc1f9bed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bd553ab9c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005
Change-Id: I818bd4e3dfaf8baa07e1d63b9df7bdc0ffc1aacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-11 20:32:25 +00:00
TreeHugger Robot
3773ae0d9f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-11 19:15:37 +00:00
Candice Lo
4eea038c26
Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev am: b0087167e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312036
Change-Id: Ie07b89f7f2095c42cd30e20d4a9a3031b679b26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-10 09:19:51 +00:00
Candice Lo
b0087167e0
Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev
2023-02-10 09:12:05 +00:00
My Name
2e552331e9
Show Bluetooth dialog in a specific case
...
If the application that initiate the bonding with
BluetoothDevice#createBond is in foreground, then should dialog only
instead of showing the notification & dialog
Bug: 175931562
Tag: #refactor
Test: manual
Change-Id: I3673a0b58cbf9caabf62c951b84b49e17cfb13b8
2023-02-10 08:31:34 +00:00
Candice Lo
3fb6e69f88
Move font size related resources to SettingsLib (1/2)
...
Since creating the seekbar for changing font size in SystemUI requires
the size of the value entry array and the values in the array.
Therefore, we move the related resource to SettingsLib to share the usage.
Bug: 242326166
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Test: Maually test the availability of changing font size through
Settings page
Change-Id: Ia2621e3b4c71f900e6591644d0e3f93bedbe4ee8
Merged-In: If630bd9c9c27823c210410b53342b921a11bbfb9
2023-02-10 06:36:50 +00:00
Bill Yi
9bd553ab9c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2569a05c74264d46ba1f85544a8aa7d0b1541d9a
2023-02-09 20:04:29 -08:00
Jiaming Liu
5a6444776a
Fix build for jetpack update
...
Fix build for jetpack update
Bug: 265818545
Test: build
Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a
)
2023-02-09 19:07:57 +00:00
Diego Vela
65bb5a09f4
Update ActivityEmbedding usage.
...
Update ActivityEmbedding usage.
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796
)
2023-02-09 17:47:52 +00:00
SongFerng Wang
327ae0d6db
Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev am: be84e27612
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21328340
Change-Id: I013418971db0db3a3e64895423063a88aac3c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-09 02:55:44 +00:00
SongFerng Wang
be84e27612
Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev
2023-02-09 01:59:50 +00:00
Treehugger Robot
cb9a31aa1c
Merge "Merge TQ1A.230205.002" am: 0a9affaaab
am: 016f304b8d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2423108
Change-Id: I22fdfd669e6ed54fab8119c4e4469855c62e7549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-08 18:45:24 +00:00
Treehugger Robot
016f304b8d
Merge "Merge TQ1A.230205.002" am: 0a9affaaab
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2423108
Change-Id: I4147301439d6f88a08a8fa0f3b78cb5c9dd13f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-08 18:13:26 +00:00
Valentin Iftime
4b733b249f
Add dimensions for notification channel panel am: 42ac382af5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21334700
Change-Id: Ifccc813cdfc93c795ec0938131adeee402f44b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-08 16:32:46 +00:00
Valentin Iftime
42ac382af5
Add dimensions for notification channel panel
...
Removes dependency on output switcher dimens.
Fix notification settings bottom sheet scroll in landscape.
Test: adb shell cmd notification post "Test notif" &
adb shell am start -a android.settings.CHANNEL_NOTIFICATION_SETTINGS --es android.provider.extra.CHANNEL_FILTER_LIST "sound" --es android.provider.extra.CHANNEL_ID "shell_cmd" --es android.provider.extra.APP_PACKAGE "com.android.shell"
Bug: 238845213
Change-Id: Iaf4b52b0aa8376c93ebc55fc005cdb55d2a9620e
2023-02-08 14:16:13 +00:00
Treehugger Robot
0a9affaaab
Merge "Merge TQ1A.230205.002"
2023-02-08 10:40:37 +00:00
SongFerngWang
e85bb5058d
Add a config to hide the 3G option at preferred network mode UI
...
Add a config config_display_network_mode_3g_option to hide the 3G
option at preferred network mode UI
Bug: 261615630
Test: build pass. local test pass.
atest EnabledNetworkModePreferenceControllerTest
Change-Id: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
(cherry picked from commit f7685dd715
)
Merged-In: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
2023-02-08 07:41:13 +00:00
TreeHugger Robot
e57000f2c4
Merge "Add animation for progress bar and lottie in fingerprint enrollment" into tm-qpr-dev am: a48f8944f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21145688
Change-Id: I69ac66e0a3d92a21c18f8980607d8b9c6571101e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-08 00:37:40 +00:00