Commit Graph

1359 Commits

Author SHA1 Message Date
TreeHugger Robot
11ea8316e0 Merge "Refinements for DND settings" into sc-dev 2021-03-18 14:35:19 +00:00
Julia Reynolds
887273b2c6 Refinements for DND settings
- Adding headers
- Remove collapsed 'advanced
- correcting label for main toggle
- fix underline

Test: manual
Fixes: 179210702
Fixes: 173910494
Change-Id: Iec67639a12c7e93dcf19d415108e7d2c1fcb93d4
2021-03-17 14:17:44 -04:00
Edgar Wang
0c914077aa Merge "Change packagename of TwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
Yanting Yang
d604ca93dc Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev 2021-03-13 16:56:29 +00:00
Julia Reynolds
efe26e2d44 Launch channel settings as half sheet
If opening app has requested only a subset of fields

Test: manual - launch from an app, filtered and unfiltered, for
normal channels and conversations
Bug: 177246841
Change-Id: Ifd70478101d1ea1340d2ecc55033fab55e65ca92

Change-Id: I5194b959c82b2cfa7990c84285aaf69464cff3a8
2021-03-12 09:58:41 -05:00
Yanting Yang
a1a30296ae Fix NPE for ConfigureNotificationSettings
The NPE is caused by that we have removed the advanced category from
Notification page for android S design but it still tries to get
category and call setInitialExpandedChildrenCount in onCreate().

Only run the relevant logic on the old design since it’s only used to
expand the advanced category and we don’t need the expand feature
anymore for android S.

Bug: 182237530
Fixes: 182532954
Test: robotest & manual
Change-Id: I96f35fa40221079d5498d9d2fab9c75d64698808
2021-03-12 16:11:23 +08:00
Julia Reynolds
ddf1958bdc Update NLS listing page
- Organized by allowed/not allowed
- Include paired devices if there are any

Test: settings robotests
Fixes: 181125174
Change-Id: Id64ee0ebd9b40a92d54a03d92fec3ff0bb3b926d
2021-03-04 20:54:10 +00:00
Mill Chen
8308928a89 Merge "Add collapsing toolbar to Notification history page" into sc-dev 2021-02-23 06:58:58 +00:00
Julia Reynolds
44e53efb52 Merge "Fix exception sorting conversations" into sc-dev 2021-02-19 19:43:01 +00:00
Julia Reynolds
85511dbef8 Fix exception sorting conversations
Test: robotests
Fixes: 178618139
Change-Id: I524187a5840163d65dce35827785f3139b6fede7
2021-02-19 13:22:31 -05:00
Mill Chen
8d0de3da05 Add collapsing toolbar to Notification history page
On Android S, collapsing toolbar will be shown in each subsetting
pages. Notification history page doesn't have collapsing toolbar since
it's not a subsetting page. We changed the base activity for Notificatio
history page to eable the feature.

Bug: 178678690
Test: visual verified
1) Settings -> Notifications -> Notification history
2) Check if the collapsig toolbar is existig in this page

Change-Id: I51d66b64dc479bbe14274301c75da67600116772
2021-02-19 18:00:20 +08:00
Tsung-Mao Fang
772477af1c Fix broken tests
1) Remove AssistantFeedbackPreferenceController since it didn't use.
2) Refine the AssistantFeedbackPreferenceControllerTest, we need to use
vpn manager object now. (See ag/13519006)

Test: Run robo test
Fix: 180576544
Change-Id: I719711d83201d571427b9f46a6026e0831cddab6
2021-02-18 10:23:25 +00:00
Julia Reynolds
4dc7795eb3 Add filtering to notification channel settings
Allow apps that are launching this page to specify targeted subsets of
settings that should be shown.

Test: settings notification robotests
Bug: 177246841
Change-Id: Ib491c43f1861a9775e3b25f39134cdbe105a7ff8
2021-02-16 14:40:26 -05:00
Edgar Wang
9691da0d21 Change packagename of TwoTargetPreference
Bug: 180156703
Test: robotest
Change-Id: Ida344e689971aa780054093b2472582d61c476d1
2021-02-13 12:17:14 +08:00
Julia Reynolds
776919fc0a Merge "Add package filtering to NLSes" into sc-dev 2021-02-12 02:16:52 +00:00
Julia Reynolds
20814ed5c7 Add package filtering to NLSes
Now users can prevent a given notification listener from seeing
notifications from particular apps.

Test: settings unit tests
Bug: 173052211
Change-Id: Ia868d6dc2da1ae7f75c0dca47034e28910584acd
2021-02-11 19:00:57 +00:00
Chloris Kuo
a58531fb9a Remove NAS adjustments related settings
The default NAS adjustments will be on by default if NAS is enabled.

Test: manual on device
Bug: 179202657
Change-Id: I8cc9e4b17da44c564b682e5064ab5bf974a14492
2021-02-08 16:15:49 -08:00
Stanley Wang
10b7a7d483 Use MainSwitchPreference to replace the button style switches.
Fix: 177967926
Fix: 177968295
Fix: 177967925
Fix: 177968078

Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
2021-02-02 08:39:37 +00:00
Julia Reynolds
33f4f59b04 Merge "Fix some issues with notif blocking in settings" 2021-01-25 17:18:53 +00:00
Beverly
857dfe131b Don't iterate channel list in bgthread
To avoid a ConcurrentModificationException

Fixes: 173674911
Test: manual
Change-Id: If35c6f66a2cfae7ee4a6f8e83dd70aa5877f8362
2021-01-22 17:43:18 +00:00
Julia Reynolds
c1ca4b81c1 Fix some issues with notif blocking in settings
- Fix cast cast exception
- Make sure unblocking a notification channel also actually
unblocks it

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 177968301
Fixes: 177907827
Change-Id: Ibad56e102e167bcf004fbd0f9873cc29834a30c1
2021-01-21 11:13:57 -05:00
Julia Reynolds
833514376e Fix null handling
Test: cts verifier, notification listener
Fixes: 177202279
Change-Id: Ib25915b0b5a60e9c39986d3ba3af3073e9d2b822
2021-01-19 14:48:52 -05:00
Yanting Yang
6ee00431e7 Merge "Move preferences to Notification page" 2021-01-15 04:55:32 +00:00
Stanley Wang
6a824b3535 Merge "Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings." 2021-01-15 02:14:52 +00:00
Yanting Yang
298991c498 Move preferences to Notification page
Based on the Android S design,
- Fork configure_notification_settings_v2 for dev.
- Move "Conversations" from Apps to Notification above "Bubbles".
- Move "Wireless emergency alerts" from Apps to Notifications.

Bug: 174964405
Test: robotest & visual with turning on/off silky home

Change-Id: Ib8e19956ed7717924423eb632d4546314a34d549
2021-01-15 00:28:39 +08:00
TreeHugger Robot
78c6656981 Merge "Refactor AppPreference and AppSwitchPreference" 2021-01-14 15:28:17 +00:00
Stanley Wang
b87ddba6cd Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings.
To log Settings metrics, the MainSwitch extends MainSwitchBar and
replace the SwitchBar in SettingsActivity.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui

Change-Id: I3add3702e9058ad9192b5172c7cf0e2ccfb55a70
2021-01-14 22:48:31 +08:00
Stanley Wang
57098f4589 Use SettingsLib's MainSwitchPreference to replace the Switches which use
LayoutPreference.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: I4588d1fc3004970b174e7c5c5d1aa7745f774985
2021-01-12 23:12:01 +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
Mill Chen
82777ba0c0 Disable toolbar title of screen lock pages
After applying collapsing toolbar in the Settings app, the toolbar title
will be shown in every subsetting pages. However some pages in the
security category don't need the title, like set screen lock page and
lock screen page. This CL is to disable these titles through overriding
isToolbarEnabled method.

Bug: 176883575
Test: manual test and visual verified
1) Navigate to Settings -> Security -> Screen lock ->
Pattern/PIN/Password
2) Observe and check if there is a duplicated title.

Change-Id: I6dfa4fbe1b5e2ac3582804ba1e125196f3bdba6c
2021-01-11 18:31:54 +08:00
tim peng
ce66cbb502 Merge "Rename MediaOutputSliceConstants to MediaOutputConstants" 2021-01-11 05:08:26 +00:00
Julia Reynolds
eb2b36a5e2 Allow notification filtering per listener.
Test: atest
Bug: 173052211
Change-Id: I54c740e9755f18339c59aad4f1f5aecd8c734892
2021-01-07 10:01:08 -05:00
Edgar Wang
e49ae19b1e Merge "Replace some customized RadioButtonPreferences" 2021-01-06 16:31:02 +00:00
Edgar Wang
c0e7328a88 Replace some customized RadioButtonPreferences
- Deleted ZenCustomRadioButtonPreference
- Deleted RadioButtonPreferenceWithExtraWidget
- Replaced with RadioButtonPreference

Bug: 173472216
Test: robotest
Change-Id: I645b59d65ae14af1f384f16ee7b76b3c98e23e1f
2021-01-06 05:37:29 +00:00
Edgar Wang
fc02ce1c20 Refactor AppPreference and AppSwitchPreference
- Move AppSwitchPreference
- Remove FeatureflagPreference summary

Bug: 176815722
Test: robotest
Change-Id: Id337097f237ac9ca6dfa01665df61b1258dc24f2
2021-01-05 18:27:08 +00:00
Treehugger Robot
ba98c52ce3 Merge "Settings observer fail to unregister." am: b92cb6678c am: 6873e19485 am: cc162a2cfa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4d0ae86737b85b4477db972700c6018e75adbb
2020-12-29 06:24:02 +00:00
Treehugger Robot
cc162a2cfa Merge "Settings observer fail to unregister." am: b92cb6678c am: 6873e19485
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d1bb6248061f8e566d6db457ee1ad81e4be116
2020-12-29 06:08:37 +00:00
andrew.gong
bf477db855 Settings observer fail to unregister.
Zen mode change will call displayPreference() and create a new SettingsObserver, then the old Observer object will have no opportunity to be unregistered. After too much new SettingsObserver creatd in Monkey test, memory might leak.

Bug 176206489

Change-Id: I3bccec281da492299bbf755f86df7844a31223c5
2020-12-24 15:57:09 +08:00
timhypeng
a7a73c4c92 Rename MediaOutputSliceConstants to MediaOutputConstants
-Slice is not used and it is better to remove the slice string

Bug: 165772904
Test: build pass
Change-Id: I38b26187f03509d0d9f5cdb8ef30f3f3ef8779d8
2020-12-24 01:07:24 +00:00
Chloris Kuo
43007847cf Feedback UI DeviceConfig
Use ENABLE_NAS_FEEDBACK flag to decide if showing feedback UI setting

Bug: 175363481
Test: make RunSettingsRoboTests7
Change-Id: I969f9ca0b5d681345c022816e104926953f855dc
2020-12-22 22:09:28 -08:00
John Li
ba55296a44 Haptic effect on swiping the notification item
Haptic once the swiping on the notification item is going to snap in either directions. The snap-in scenario is about the notification item when there is a "snap back point" i.e. if swiping the item back till a certain point it just snaps back to initial state but once it goes past a certain location it snaps into the new location.

- screenshot, https://screenshot.googleplex.com/6A8Gxs7yRwqAVk2

Bug: 175364588
Test: manual
Change-Id: I7e2ed19bfb7f863502e10233e3e23ee5d434b3b4
2020-12-17 03:31:18 +00:00
timhypeng
3273b4ebb4 Update rule of launching media output dialog am: 6472c98ffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaeec1436e45b25fce4a4ef08155d35b8b047d916
2020-12-08 06:28:50 +00:00
timhypeng
c26d9f3d48 Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0fc610e5b5f17f9788fc12b96d2871c20be9725
2020-12-08 06:28:49 +00:00
tim peng
de2f2754d9 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev 2020-12-08 00:55:21 +00:00
Eugene Susla
31505ca0b3 RESTRICT AUTOMERGE am: bfa7a75545 am: d67e22c122
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: I1a046e98511c50641b0fcb42b97233b3fa36e6dd
2020-12-07 16:58:33 +00:00
Eugene Susla
d67e22c122 RESTRICT AUTOMERGE am: bfa7a75545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: Id7909dd47451e3fbd02b5ca3ce4643cdd1da6715
2020-12-07 16:44:22 +00:00
TreeHugger Robot
538f5420ac Merge "Fine tune the icon size for some pages" 2020-12-07 08:14:17 +00:00
Tsung-Mao Fang
3d01afc621 Fine tune the icon size for some pages
Based on our Android S spec, we should make the size smaller for icons.

Test:
Notification access: https://screenshot.googleplex.com/Ah8wjmzggDQyhmP
Device admin: https://screenshot.googleplex.com/5tS64HxZz3ywPZZ
Fix: 174739497
Change-Id: Iad4a48b558084d7374fec515891d01d3e7d41108
2020-12-03 12:58:29 +00:00
timhypeng
6472c98ffa Update rule of launching media output dialog
-Do not hide Media Output Dialog in Settings, and let dialog handles
-Hide Media output slice panel when launching dialog

Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Merged-In: I16732f625f100b259d6e53c85db40af0ec1652c5
Change-Id: I16732f625f100b259d6e53c85db40af0ec1652c5
2020-11-30 13:33:59 +00:00
timhypeng
7127fff467 Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
-Update entry point at media indicator in volume panel
-Update entry point at remote media slice in volume panel
-Update entry point at remote volume group in Sound Settings
-Update entry point at media output preference in Sound Settings
-Hide Media output dialog when the caller is not active

Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Merged-In: Ib6c86067522925c439f336644e4d027dbae3379c
Change-Id: Ib6c86067522925c439f336644e4d027dbae3379c
2020-11-30 13:33:47 +00:00