Commit Graph

131 Commits

Author SHA1 Message Date
Arman-ATI
1668677ddf [VANILLA REVERTME] Settings: Add changes for SettingsGoogle 2025-12-10 00:41:34 +09:00
Chris Crump
bc315d1771 Settings: Introduce Adaptive Playback [2/2]
* Animation by Sahul Krishan
* Adapt to Android 11 by @mickaelmendes50

[Hernán Castañón] Adaptive Playback: allow choosing no timeout.

Co-authored-by: Hernán Castañón Álvarez <herna@paranoidandroid.co>
Change-Id: I82c20b89d06b722d8f9da1bdb14eb096a7d088c9

AdaptivePlayback: Add a intro text to the fragment

 * Let's help users to understand what the feature does
   by adding a little introduction text.

Change-Id: Ie9ef15d7f60ab2197c30c79434c9fb876c498cd5
Co-authored-by: AshutoshSundresh <ashutoshsundresh@gmail.com>
Signed-off-by: Mesquita <mesquita@aospa.co>

Settings: Move "Adaptive Playback" option to Sound Settings.

 * Our gestures category looks bloated with features.
   Move this to Sound Settings where it feels better and more homely.

Change-Id: I28fd022a4998141435a1e89a027b7a1fe6f75537
Signed-off-by: Mesquita <mesquita@aospa.co>

AdaptivePlayback: Rename it to 'Smart Pause' to keep a better fluency

 * As we already have an 'Adaptive Sound' in sound settings

Change-Id: Iaca4b7d65fe490ee6462ba49907316930deaeaa5
Signed-off-by: Mesquita <mesquita@aospa.co>

Change-Id: I82c20b89d06b722d8f9da1bdb14eb096a7d088c9
2025-12-10 00:41:33 +09:00
Joey Huab
4e41856a9b [TMP] Settings: Drop changes for SettingsGoogle
Revert "Settings: Update gesture and security prefs"

This reverts commit bbba3dc66cc38c18c8656b92b5cdcc6c818183dd.

Revert "Settings: Remove duplicate adaptive preferences"

This reverts commit efc40de6ea5bb13a3cdcdd3ce40ddf03794910e6.

Revert "Settings: Import settings from pixel-fw"

This reverts commit 728adfe615efce272c941aaa2ea1fbc4b8252d47.

Revert "Settings: Import columbus preference settings"

This reverts commit 9730ea6ef9dc14f38c0306302943b96d2b040e2e.

Revert "Settings: Replace android:name for SettingsGoogle"

This reverts commit d0bb4734e998a35297de6bf0915d7338dba7fe7d.

Revert "Settings: Define android manifest"

This reverts commit a11e61d788037ebe40a809b5212ebd79d91f0bec.
2025-12-10 00:41:32 +09:00
Ido Ben-Hur
d071bfebf5 Settings: Move custom vib pattern to its own preference
Also improve the code while at it

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:31 +09:00
Ido Ben-Hur
5c1cea77b5 Settings: Allow choosing a custom vibration pattern [3/3]
Change-Id: I574da771ae90321f65d8ffddecd59db430105bb2
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:31 +09:00
Ido Ben-Hur
9b3c789826 Settings: Add vibration patterns from OOS [3/3]
a rewrite of: c4560cafae

Change-Id: If5e776b622d603ed9c4022e23e6904b5c996e195
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:31 +09:00
someone5678
6f6aa340cf Settings: Use List Preference for Dock speaker plays and Emergency tone
Change-Id: Ia899f2ba6d4663c2315ee35c093ca14cb26ae450
2025-12-10 00:41:31 +09:00
Joey
f401bbc5ad Settings: Add a preference controller for Volume steps settings
* Enable volume steps pref by default
2025-12-10 00:41:31 +09:00
Ido Ben-Hur
f7df878d2f Settings: Allow customizing volume stream steps [2/2]
only media, calls and alarms seem fit
the rest are pretty much set and forget and don't need vol button granularity

Change-Id: I6ce6fa79df7b94ae84912945f6129048895067b2
2025-12-10 00:41:31 +09:00
Danny Baumann
ee39140069 Settings: Add back increasing ring feature (2/3)
This is a squash of the following commits:

Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Nov 11 13:14:07 2014 +0100

    Add back increasing ring feature (2/3).

    Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be

Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Nov 24 13:05:39 2014 +0100

    Fix NPE.

    When entering the notification prefs sub activity without the increasing
    ring pref being visible and leaving it right away, onActivityStop()
    threw an NPE because the handler wasn't yet constructed.

    Change-Id: Ia4291d8ac3d1dbf76d432db7e0e973844163c4ae

Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri May 29 08:48:46 2015 +0200

    Fix up increasing ring tone volume preview behaviour.

    Change-Id: Ibe7fdf1ee7f0aa1c7c76052df69fa92e8b6a2ffd

Author: Keith Mok <kmok@cyngn.com>
Date:   Tue Jul 12 09:45:45 2016 -0700

    Settings: Always set ramp-up time value during bindView

    onProgressChange is not always called if we set the
    ramp up time to 5 sec (0 in seekbar value, since it is
    the default value, no change).
    Causing the text showing the ramp up time text value not
    updated and display as empty when user enable/disable
    increasing ring volume with ramp up time set to 5 sec.

    FEIJ-1572

    Change-Id: Id32d6b51aab05e80be59bc1912c4ae7c5d114ac5

Author: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date:   Wed, 18 Jan 2017 15:55:13 +0800

    Move notif volume pref on top of increasing ring pref

    Change Iafc79a57651db327a100e0f1723b62f442b638be added two
    increasing ringtone-related preferences between the notification
    volume preference and the ring volume preference.

    However, the notification volume preference should be grouped
    together with the media, alarm, and ring volume preferences.

    Hence, move the notification volume preference back to where
    it should be.

    Change-Id: I138e6f78b6c231643d86746858e0cbdfcb0942eb

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Mon Dec 11 23:45:39 2017 +0000

    Adapt increasing ring feature to O-MR1 and new Settings UI

     * Make it depend on SettingsLib's version of Lifecycle and Mixin.

     * Create a custom style for the IncreasingRingtonePreference
       and match the new UI in Oreo Settings app.

    Change-Id: I25462159fa39f5cdaddb1898c71f536572e900a4

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Fri Jan 14 17:56:29 2022 +0000

    Adapt increasing ring feature to S and new Settings UI

    Change-Id: Ib70f6f71f62e59c945d69ab9c23ca185fde4a4b0

Change-Id: I3f22c77504a5014f9dbd40909d760149143570fe
2025-12-10 00:41:30 +09:00
jhenrique09
2ad3bcbcd7 Settings: Use AOSP translations for MSIM ringtone
Change-Id: I048a161e33eaabe8d2eb46fee49cae844836258f
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:30 +09:00
Ting Yu
a89d02598f Settings: Phone ringtone setting for Multi SIM device [2/3]
Support displaying phone ringtone setting for each slot as follows:
"Phone ringtone - SIM 1"
"Phone ringtone - SIM 2"

The purpose is to distinguish incoming call from each slot by ringtone.

Depends-On: I9c6ccff938122332d222853d469ad9a623c7d193

Bug: 118735436
Test: Manual
Change-Id: I06c59016e9b6da51ed8a4678a66674fc48c20e40
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:30 +09:00
Pranav Vashi
8ac1c2ea3a Settings: Import settings from pixel-fw
mnri: Updated for u qpr2
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Alvin Francis <nivlafx@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:28 +09:00
ReallySnow
78ec325a8b Settings: Add missing icon for media output
Change-Id: Id4ac89dba079ab46dcb7d97cca7b2c4c8f9fb612
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:27 +09:00
cjybyjk
c7a35a8bc1 Settings: support per-app volume [3/3]
Change-Id: I3e72a4b0fda68a5cd1e9a35fc161a1d7ddae6d7e

Signed-off-by: AnierinB <anierin@evolution-x.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-12-10 00:41:25 +09:00
someone5678
cd266c38ea Settings: Allow disabling of screenshot shutter sound [2/2]
Change-Id: If214da9416f673f3a9b806d0c49dbcbefb168f10
2025-12-10 00:41:25 +09:00
Sam Mortimer
ce15d330cc Settings: Add LineageParts charging sound settings preference
Replace the existing AOSP setting with this.

Change-Id: I13894a86bcfad8d1dfaedc2dcbca6ad70f651b5c
2025-06-22 12:59:29 +03:00
Michael Mikhail
aec68e2372 [catalyst] migrate media controls settings
Flag: com.android.settings.flags.catalyst_media_controls
Fixes: 337243570
Fixes: 389133530
Fixes: 389133114
Test: atest MediaControlsLockScreenSwitchPreferenceTest
Test: atest MediaControlsSwitchPreferenceTest
Change-Id: Ibe8fed064cd6223085764f5125cff45a9bea734d
2025-03-03 22:50:05 +00:00
Mill Chen
898feed16a Migrate Dial pad tones preference
Bug: 364899400
Test: atest DialPadTonePreferenceTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: I5939a4d41ad61337f38bd5d48a1cb74f14f1e397
2024-10-16 09:25:13 +00:00
Yuri Lin
3ccbb0ffa5 Add modes to Settings homepage.
Also moves the modes entrypoints out of the sub-pages it was previously in (notifications and sound settings).

Bug: 353700470
Test: manual by opening the homepage
Flag: android.app.modes_ui
Change-Id: I53124bfed25c43fc2dabaf9c43ce0513bbfc7377
2024-08-28 13:13:46 -04:00
Alexander Roederer
9c4521d094 Add Priority Modes link preference to sound
Test: manual. Flash and check Sound settings page
Flag: android.app.modes_ui
Bug: 341726633
Change-Id: Ic693057e537b7c663a111ce5165bb46d32d93642
2024-08-07 21:29:09 +00:00
Chaohui Wang
70c4dcd507 Migrate xml to SwitchPreferenceCompat
Bug: 285231003
Test: manual - on affected pages
Change-Id: I83283fcc4b241596a8f0cdf5299417bce2810d0c
2023-10-25 14:22:20 +08:00
Edgar Wang
ab75ea8099 Restrict toggle/slider slice when the preference restricted
Bug: 289980550
Test: robotest & manual
Change-Id: Id87fbf12a2722344dd07886e810e7c61a9f401aa
2023-07-20 03:36:35 +00:00
Behnam Heydarshahi
f07e023302 Remove volume_separate_notification flag
Fully enable the feature

Bug: b/255363741, b/38477228

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|SeparateRingVolumePreferenceControllerTest|RingerModeAffectedPreferenceControllerTest|SoundSettingsTest" RunSettingsRoboTests -j40
Change-Id: Iec490fc254f71b6461dbf9f9beb4a11645a4a497
2023-05-15 21:19:26 +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
4f87dd4b56 Implement a separate controller for ring volume
When ring volume is separated from notification, a new xml preferece and
controller is needed for it, so that the settings search can show/hide
the slice correctly.

1. Use a separate preference and controller for ring volume (vs ring &
notification combined)
2. Notification slice in settings no longer grays out when ringer mode
is set to mute or vibrate.
3. Introduce an abstract RingerModeAffected preference controller class
to factor out duplicate code among ring, notification, and separate-ring
controller classes.

Bug: b/259084354

Test:   make ROBOTEST_FILTER=RingVolumePreferenceControllerTest
RunSettingsRoboTests -j40
        make ROBOTEST_FILTER=SeparateRingVolumePreferenceControllerTest
RunSettingsRoboTests -j40
        make ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest
RunSettingsRoboTests -j40
        make ROBOTEST_FILTER=VolumePanelTest RunSettingsRoboTests -j40
	make
ROBOTEST_FILTER=RingerModeAffectedVolumePreferenceControllerTest -j40

Known Issue:
1. When streams are separate and ring volume set to mute/vibrate,
notification is set to zero, but not disabled. So it can be turned on
by user (and in settings the icon will stay mute/vibrate instead of
changing to the normal notification icon).

2. In the above scenario after notification is unmuted in settings,
the notification icon continues to stay vibrate/mute -- should change
to the normal notification icon.

Note: This feature is controlled using a boolean DeviceConfig flag:
systemui/"volume_separate_ring". The default value is 'false', which is
meant to keep the experience the same as before. It will be set to
'true' for teamfood and dogfood. Eventually the flag will be removed and
the code in the 'true' branch will prevail.


Change-Id: Ibec871eafeef4081e96c5e0dd04535565d50a077
2022-12-28 22:33:50 +00:00
Behnam Heydarshahi
3ac6aaf796 Add notification volume controller in settings
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.

For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.

Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".

Bug: b/38477228

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests

Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
2022-10-10 14:42:56 +00:00
Alan Huang
616b0925ac DO NOT MERGE Add setting page for the Spatial audio
The Spatial audio settings page control the state for the phone speaker
and the wired headphones

Test: make RunSettingsRoboTests

Bug: 220811398
Change-Id: I49e3fab48186d09357a8481652bdccb4aa5d044a
2022-03-20 15:55:53 +00:00
Evan Laird
4871b2cf6a Add setting for showing the vibrate icon in status bar
Test: manual
Bug: 220144337
Change-Id: I2d389d71dd9402353b058039464495a1d33ef0e9
2022-02-23 15:42:57 +00:00
Lais Andrade
fe2ed12d26 Move vibrate for calls setting to "Vibration & haptics" screen
Move setting to configure "Vibrate for calls" into "Vibraiton & haptics"
screen. Also make this page accessible via both Accessibility and
"Sound & vibration" settings pages.

Bug: 185351540
Test: SoundSettingsTest
      manually using the settings app and checking updates
Change-Id: I7e40af3f332fdff8afd1a31d54a676f7e13a6678
2021-12-06 17:23:56 +00:00
TreeHugger Robot
58edb69d46 Merge "Add the Spatial audio toggle in SoundSettings" into sc-v2-dev am: a448a917eb am: edc5e940ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15884455

Change-Id: Iedbf25f530937ae35e7b772873df994036c1d237
2021-09-23 06:55:21 +00:00
Alan Huang
e303658f0d Add the Spatial audio toggle in SoundSettings
The Spatial audio toggle will be showed only on supported devices

Test: robotest, manual checked the UI, but not the actual functionality due to
doesn't have supported device in hand

Bug: 191870827
Change-Id: I7db264902b03fddb7808676d8cb98cbe045deda1
2021-09-23 04:45:46 +00:00
Wilson Wu
9edf79741d Update settings PrimarySwitchPreference reference
To make InputMethodPreference support 2 target
reference, CL[1] move the PrimarySwitchPreference
into SettingsLib.

Change all PrimarySwitchPreference reference to
Settingslib one and remove the original one.

[1]: Idea3935d95b8d22b00ca89313e9eb3e979e4aa74

Bug: 197705032
Test: Presubmit
Change-Id: I95d111522344bb7cbdd380382e48fe60a5ebc9a2
2021-09-02 13:10:19 +08:00
Yanting Yang
beb14dbfbc Remove silky flag from Sound for official release
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: Ica8217b3921235c9e79cf8f8b531637180552f3b
2021-05-25 06:05:00 +08:00
Yi-Ling Chuang
b058221b62 Add inline toggle for Prevent Ringing gesture.
- Fork sound_settings_v2 for dev.
- Replace Preference with PrimarySwitchPreference for the Prevent
Ringing entry.
- When the toggle is on, only show the status text without the on/off
info.
- Remove unused codes.

Bug: 174964721
Test: robotests
Change-Id: I990f5c778436c8058d4a5953c7f15a9a7eb580d8
2021-01-12 12:48:41 +08:00
Beth Thibodeau
59cbd11c04 Add toggle for media resumption
Adds a toggle under Settings > Sound > Media to toggle media resumption

Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="MediaControls"

Change-Id: I803c57031bc3252cab35c06ea124d1c22a3c3aeb
2020-06-20 00:12:23 +00:00
Tsung-Mao Fang
6b73e0fc97 Add keywords for a few settings
Test: Rebuilt apk, and see the results in settings search.
Fix: 157978733
Change-Id: Ib02adf8b3fd11b619246a2bd050801b9fa5ec7d3
2020-06-04 17:16:23 +08:00
Tim Peng
f392eae213 Update "Play media to" in Sound Settings
-Change string to "Play <APP Label> on"
-Hide it when there is no local playback
-Disable search index
-Add test cases

Bug: 155720628
Test: make -j50 RunSettingsRoboTests
Change-Id: Id104d5b49c069a761e4cf82385bf1225d494c95e
2020-05-08 12:15:11 +08:00
Yanting Yang
855f704eca Merge "Remove index for Take call on of Sound page" into rvc-dev 2020-04-30 12:30:53 +00:00
Sunny Shao
502a5eb1c5 Fix the preference index conflict problem
Bug: 153888035
Test: manual test
Change-Id: I6c67d2fea752487ceb5fa05c6537df980a0f8d6a
2020-04-29 11:53:55 +00:00
Yanting Yang
df5aaec663 Remove index for Take call on of Sound page
"Take call on" is only visible when there are multiple media devices
connected and phone call is incoming or answering. In general, this
preference is hard to see for users.

In reality, users usually change the phone call output on Phone app,
it's a rare case that user will go to Settings to search "Take call on"
to change the phone call output when they are answering call.

Intend to remove its index from Settings Search first since it's almost
invisible on Sound page. Users will confuse that why Sound page doesn't
show the corresponding preference when they found the "Take call on" and
tapped on it from Settings Search.

Fixes: 140392320
Test: visual and robotests
Change-Id: I87ec4fda2a3d8625c8f09beeffe348a302187d6d
2020-04-29 17:14:35 +08:00
Jason Chiu
26343b82ee Add metric logs for special cases in Display and Battery page
Bug: 137559984
Test: robotest
Change-Id: I60f6237ac2c533306879f46ee4c25d54002cf0e9
2020-03-26 11:31:39 +08:00
tim peng
b27db300eb Merge "Replace preference with remote media preference group in xml" 2020-02-18 00:57:30 +00:00
Edgar Wang
77de405a5d Make TopLevelSettings un-searchable and direct result to relevant page.
Fixes: 149372187
Test: manual & robotest
Change-Id: I9daca03d1c11a262f8e3b55bb46aabbc035ece96
2020-02-14 17:58:38 +08:00
timhypeng
716777d3ad Replace preference with remote media preference group in xml
-remove previous preference controller and its test cases
-update sound setting test case

Bug: 147395289
Test: make -j42 RunSettingsRoboTests
Change-Id: I9e383e11370a13868fdbcb76eafef5aedad895c5
2020-02-12 04:57:18 +00:00
Edgar Wang
0934babbfc Make the fragment title can’t searchable
we shouldn't take users so deep into the settings IA because it's easy
to feel lost in settings after clicking on a result without additional
context.

Bug: 143055215
Test: robotest & manual
Change-Id: I337cb5ead31e1e4e7bf9be78132e90630f83ee43
2020-02-06 19:07:11 +08:00
Yiwen Chen
4b4c6c2c7b Implement new vibrate for calls in Settings.
Test: built and tested on device
Change-Id: Ia6ca7eb54472d44a9934d7f125a9f71e42c616a3
2020-02-03 13:32:58 -08:00
Julia Reynolds
aceccce75c Reorganize notification Settings classes
The notification package was getting too big.

Test: make -j64 RunSettingsRoboTests
Fixes: 145224451
Change-Id: I25ba82f42f7a137d8adcce72dcf8089d0e018bdc
2019-11-27 10:02:13 -05:00
Fan Zhang
7df6445c3e Clean up DND slice in search.
- Remove the controller in SoundSettings, just use the common one.
- Update a bunch of IDs so ZenModeSliceBuilder maps to the toggle
  button in zen_mode_settings.xml

This is needed so the slice intent (left target when shown in search)
is the same as what we index from search side. Previously the search
indexer is finding zen_mode from sound page but the slice itself is
reporting a deep link into zenModeSettings page.

Fixes: 130437726
Test: robotest

Change-Id: Ic41d2d93afa1f748e3282e23010199a0fa078645
2019-04-12 16:11:31 -07:00
Stanley Wang
bae490bc85 DND should be displayed on search as slice.
Add ZenModeSoundSettingsPreferenceController extends ZenModePreferenceController,
and update availability status to AVAILABLE.

This is cherry-picked from ag/6897872

Change-Id: I8dcb6808cc21c4f5c06548a363c998e369646487
Bug: 129320642
Test: manual & robotests
2019-04-05 02:53:04 +00:00