Commit Graph

44767 Commits

Author SHA1 Message Date
Menghan Li
888f534cef Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: If09f5e93946ec39b2a8848de07b9c331f2a57dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 03:36:43 +00:00
menghanli
e1ce633dd4 fix(tablet assets): update a11y button navigation asset for tablets
Fix: 269707768
Test: Go to Settings > Accessibility > Accessibility shortcuts > Accessibility button > Location to "Navigation bar".
Change-Id: I2d56a104848c93d8e6d138c849d05b4a77388c3b
2023-02-18 08:43:36 +08:00
TreeHugger Robot
966de44fd9 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446

Change-Id: I8e50b809f73f0f4913672f87f797d9fb4700be99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 15:13:11 +00:00
TreeHugger Robot
6014caf440 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev 2023-02-17 14:47:37 +00:00
menghanli
46ce9ae5ac RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270

Change-Id: I291a61602816049647592c17588771ece1cfcc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 10:13:55 +00:00
TreeHugger Robot
1692714346 Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev 2023-02-17 09:02:46 +00:00
Behnam Heydarshahi
d65e087b0d Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988

Change-Id: I8043d9156b1602379a6580cffb29c5addf32d8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:01:11 +00:00
Behnam Heydarshahi
40a293fbdf Merge "Muting ring volume slider disables notification" into tm-qpr-dev 2023-02-16 14:20:07 +00:00
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
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
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
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
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
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
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
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
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
TreeHugger Robot
a48f8944f9 Merge "Add animation for progress bar and lottie in fingerprint enrollment" into tm-qpr-dev 2023-02-07 23:53:42 +00:00
Diya Bera
7eb40da9c4 Add animation for progress bar and lottie in fingerprint enrollment
Test: Manual - While enrolling a fingerprint, onHelp will cause the
lottie and progress bar to shake
Bug: 266838595

Change-Id: I547d86182a87846aca7d025b35a008675f449e2e
Merged-in: I547d86182a87846aca7d025b35a008675f449e2e
2023-02-07 22:48:55 +00:00
Zoey Chen
245def5cad [Settings] Add the CarrierNetworkChange case am: ba7418ecd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312559

Change-Id: Ie5927ffa717e26bc452c74f5ddb94f84720e9b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 13:31:29 +00:00
Zoey Chen
ba7418ecd7 [Settings] Add the CarrierNetworkChange case
Bug: 262927206
Test: atest SubscriptionsPreferenceControllerTest
Change-Id: If7eeb185224179d59ab841af0062ec5b98b956e9
Merged-In: If7eeb185224179d59ab841af0062ec5b98b956e9
2023-02-07 10:48:30 +00:00
Xin Li
c660135971 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Diya Bera
8f2a74479a Merge "Remove background tint during SUW" into tm-qpr-dev am: 135041eab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21265617

Change-Id: I673e399d2e40d9dec1b216901902645be022dd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 18:28:50 +00:00
Diya Bera
135041eab5 Merge "Remove background tint during SUW" into tm-qpr-dev 2023-02-06 17:57:55 +00:00
Lucas Silva
2c7a55ed05 Add content description to screensaver customization button am: ca65b6e5ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21268649

Change-Id: Ia8a22edd2cdea63042d535d6ad7ebe3ae27d125d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 15:49:38 +00:00
Diya Bera
87567ceb5e Remove background tint during SUW
Test: Manual - navigate to the activity mentioned in the bug and observe
the background
Bug: 264993674

Change-Id: I21c8143099e4c76ed5744cff12f31f578320a871
2023-02-03 23:29:06 +00:00
Lucas Silva
ca65b6e5ba Add content description to screensaver customization button
This will let users know which screensaver they are customizing.

Fixes: 267582102
Test: flashed device and enabled talkback, opened screensaver settings,
and verified talkback correctly says the name of the screensaver

Change-Id: I9d0d9422f06b7a78efca0e6953b73fe612f79e2a
2023-02-03 15:27:26 -05:00