Commit Graph

993 Commits

Author SHA1 Message Date
Tamas Berghammer
265d3c2a0c Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
2016-11-08 14:06:17 +00:00
Julia Reynolds
ec767cc440 Channel updates from users lock fields from interference.
Also some apis have changed.

Test: manual, modify settings and check policy xml.

Change-Id: I967cb1fb30d8d400bdc0f3aa92fa07b4c87ddcf5
2016-10-31 15:16:28 -04:00
Fan Zhang
fdb833873a Use new app header in more screens.
- This covers app data usage settings, power usage details
- Addded helper method on AppHeaderController to build the header as
  Preference because every fragment needs to do this anyway.

Bug: 32442716
Test: RunSettingsRoboTests

Change-Id: I6d38321b867154f8fb5194b993d118bcdbbfedc9
2016-10-28 17:16:39 -07:00
Fan Zhang
1ff25ba7e6 Modify AppHeaderController to provide UI for notif settings
- The AppHeaderController is no longer a singleton. Each time appheader
  should be updated we will create a new controller. It acts as a
  builder/mutator, user provides customizable inputs, and the controller
  will bind everything to UI when calling done().

Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: Icfc5bcd8bc170a02b57432d864eaddf71db0d5b4
2016-10-27 17:23:33 -07:00
Fan Zhang
242da31179 Fix logging spam in DashboardFragment.
When updating preferences managed through PreferenceController, the
fragment should skip prefs that are not available.

Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: I2f9b6ddf8c78d40068dc18f07e60672dcba4474a
2016-10-25 17:14:47 -07:00
Fan Zhang
5b6478a349 Add swipe to see notification to "Notification preferences"
Bug: 31799948
Test: RunSettingsRoboTests
Change-Id: Ib892ca4d5596c1c89e1efaf636a3eefd7cee371a
2016-10-24 15:33:12 -07:00
Fan Zhang
f83ce92aaf Update Notification preferences UI in new IA.
- Refactored ConfigureNotificationSettings to be more modular
- And tests

Bug: 31799948
Test: RunSettingsRoboTests
Change-Id: I2ecd8930a6aa501c1e625cab6ed25a46f3437e85
2016-10-24 13:33:14 -07:00
Julia Reynolds
6e99b3ee4e Fix settings crash when disabling listener.
Bug: 32092445
Test: manual
Change-Id: Iaa26e755381ba202cccf6d518dacb86eae4c6d10
2016-10-11 17:22:44 -04:00
Dan Sandler
acf763e996 Suppress notif block/silence settings for essential packages.
Companion to change I6b8fa374.

Bug: 31360343
Test: Manual. With config_nonBlockableNotificationPackages
      set to include com.android.dialer, examine Dialer's
      notification settings. Be sure to test with advanced
      notification controls enabled in System UI Tuner.
Change-Id: Ifbe13acf4cb02d6642f5c80e000f5b558f289920
2016-10-05 14:18:40 +00:00
Fan Zhang
aa71afe597 Use MetricsFeatureProvider for logging in Settings.
Bug: 31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
      verifying log

Change-Id: Id944be7c4ff9911aebee481c2df485542f1318f0
2016-09-23 08:37:37 -07:00
Fan Zhang
1e516287bd Add visibility metrics to dialogs.
Bug: 30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Change-Id: I199d2e1b2cb8588a562b46bb8128d8ece24952f0
2016-09-19 17:34:12 -07:00
Julia Reynolds
b5ec2d71a2 Add notification channel settings.
If a user has set a preference at an app wide level, it cannot be
undone at a channel level, but channels can be more restrictive.

Tests: changing settings for apps and channels.

Change-Id: I7907b8179ffc24d68197c917f182e63d8e1ff7a7
2016-09-15 21:46:17 -04:00
Julia Reynolds
5de900acf9 Non-blockable notification packages can't be blocked. am: 77b1f52574 am: d8a033cca5
am: 77f405ae50

Change-Id: I22a588c12e61774a46e79f34e0a6190116c27c8f
2016-09-15 18:34:24 +00:00
Julia Reynolds
77b1f52574 Non-blockable notification packages can't be blocked.
Bug: 31404047
Change-Id: Icbe7e5e57983d281f6fe21e9b4715c822784d43c
2016-09-12 11:13:10 -04:00
Robin Lee
788671647c Eliminate useless 'isManagedProfile' utils method
This exists in UserManager now

Change-Id: If35326a1fe0de3c7bfde842c5c170899dc5d819b
2016-09-12 16:25:28 +09:00
Salvador Martinez
923534f641 resolve merge conflicts of 8ec7028 to master
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
2016-09-07 10:24:03 -07:00
Salvador Martinez
b706d4e956 Fixed Sound Settings summary text
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.

Test: make SettingsTests
Bug: 31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
2016-09-06 17:23:50 -07:00
TreeHugger Robot
1355d03287 Merge "[Settings App] Get ringtone titles from Ringtone" 2016-09-06 00:27:39 +00:00
Robin Lee
83e5babed1 Merge "Cut work sound prefs when personal ones are gone" 2016-09-05 09:58:17 +00:00
Robin Lee
e51fc163c2 Cut work sound prefs when personal ones are gone
For example when:
 - voice calls aren't supported, we hide phone ringtone.
 - audio is single stream, we hide everything.

Bug: 30658854
Change-Id: I8b2ad2fa08b35fa93f10447ef718a767fa389417
2016-09-02 17:28:00 +01:00
Geoffrey Pitsch
75dc84c85e Only show BootSounds preference if has_boot_sounds is true. am: fd351eaaf1 am: de67bc9d68
am: 93352a4451

Change-Id: I6fe28d8c40bd254458121f1bea3c23b567f36b18
2016-08-29 13:39:23 +00:00
Geoffrey Pitsch
de67bc9d68 Only show BootSounds preference if has_boot_sounds is true.
am: fd351eaaf1

Change-Id: Iac1ce93f1c9cb063162c2eab14774b720b4eb4e8
2016-08-29 13:12:23 +00:00
Geoffrey Pitsch
1ff11c5ef0 Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev 2016-08-29 13:06:21 +00:00
Andre Lago
7b92e281a7 [Settings App] Get ringtone titles from Ringtone
Instead of using custom code to get ringtone titles, use the Ringtone
API which already returns 'None' if the Uri is null

Bug: 31084929
Change-Id: Ifff3eaa3591e90020a2ac108a5916e19fb71e0bd
2016-08-25 16:27:46 +00:00
André Lago
6ecc414e77 Merge "[Settings] Set different ringtones at work profile" 2016-08-19 17:02:03 +00:00
TreeHugger Robot
b0e8f67389 Merge "Log visibility change for all fragments." 2016-08-18 21:06:00 +00:00
Fan Zhang
6507613ebc Log visibility change for all fragments.
Bug: 30681771
Test: SettingsUnitTests

Refactor visibility logging from InstrumentedFragment into a mixin. And
apply mixin in remaining fragments.

Change-Id: Ibbb59904336254a3e4bb9e8c7d0b36e5a6bc2622
2016-08-18 14:04:13 -07:00
Julia Reynolds
68ebc7019c Display days of week in locale order. am: 0bb60ada96 am: c3997cbae1
am: 6a710906a7

Change-Id: I3e22b4dbe5c96e5a1ff674c0ab3736f3d3ec81fd
2016-08-18 00:50:15 +00:00
Julia Reynolds
c3997cbae1 Display days of week in locale order.
am: 0bb60ada96

Change-Id: I9c6cb0b0947d8d313fa5794185fbe119cfa7725a
2016-08-17 18:11:43 +00:00
Julia Reynolds
8d9ade8b9c Merge "Display days of week in locale order." into nyc-mr1-dev 2016-08-17 16:42:25 +00:00
Geoffrey Pitsch
fd351eaaf1 Only show BootSounds preference if has_boot_sounds is true.
Defaults to false, to be overridden in device values.

Bug:30888962
Change-Id: I563b15b793f1a214598bb7b5a3d9dc9cf3af0d10
2016-08-16 14:34:38 -04:00
Andre Lago
3e398c87f2 [Settings] Set different ringtones at work profile
Updated the Settings app to allow setting different default system
ringtones for work profile apps

Bug: 30658854
Change-Id: I7461be070bd4e8d86bf1fd724039e53d500094ad
2016-08-15 11:11:56 +01:00
Geoffrey Pitsch
5faccbaa56 Boot Sounds setting in OtherSoundSettings am: 7f6d27b1ce am: 56aa7785ae
am: eaf998a65e

Change-Id: Ic9e9704c93d046f3babf76798b0a138acc1fbdc0
2016-08-09 20:04:27 +00:00
Geoffrey Pitsch
7f6d27b1ce Boot Sounds setting in OtherSoundSettings
Uses a persistent system property so it can be accessed by bootanim.

BUG:30690353
Change-Id: Iffb7e140074b8bf4b0faabdecbbf163b14360655
2016-08-09 13:57:01 -04:00
Julia Reynolds
0bb60ada96 Display days of week in locale order.
Change-Id: Id5d5920089a5da1fbdc7802431ca2909f72d7e12
Fixes: 21304061
2016-07-20 15:15:16 -04:00
Esteban Talavera
cd4b145d80 Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am: 080f794b6e
am: 67cf3e6a88

Change-Id: I635850140226144c67737689e8312aa935d2d589
2016-07-15 17:55:57 +00:00
Tony Mak
6ba9e15c4a Disallow user to block notification from OobConfig
Change-Id: I4680e5c5b596e81ac33d544d0d81de9df3b7587c
Fix: 29632126
2016-07-14 15:32:26 +08:00
Julia Reynolds
dfe0da7511 Merge \\"Correct logic for showing overide dnd field.\\" into nyc-mr1-dev am: 42d2fda721
am: 8f98525de1

Change-Id: I950009a9c50d774b334b5d3603beba92959e8b7f
2016-07-12 14:11:13 +00:00
Julia Reynolds
2c1eb80b1d Correct logic for showing overide dnd field.
Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes: 29995563
2016-07-11 09:10:11 -04:00
Muyuan Li
5a48c8493f Only shows music stream when using master stream.
Bug: 29446492
Change-Id: I52b686daa21499d0b054f762251c544c263fdec4
(cherry picked from commit ec88e104befb872c0bde99871eec73bf5d705369)
2016-06-28 20:51:32 +00:00
Andrew Sapperstein
084322e4ee Merge \\"Update Settings to use DeviceDefault.Settings.\\" into nyc-mr1-dev am: 70ff5f8fa1
am: 61c34c0556

Change-Id: I765efb2be73d4791cac1f53d491efb533bbbe20e
2016-06-22 00:55:25 +00:00
Andrew Sapperstein
70ff5f8fa1 Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev 2016-06-21 23:02:13 +00:00
Andrew Sapperstein
5b66e143cc Update Settings to use DeviceDefault.Settings.
BUG: 28625050

Change-Id: Id283703a309cf27bb284147421614196e903c660
2016-06-21 11:23:39 -07:00
Julia Reynolds
8dc40b87a7 Merge \\\"Fix NPE printing notification actions.\\\" into nyc-dev am: 43b04bcc7d am: 018444ab61
am: 4606b359e9

Change-Id: I221d2967735e7867969bd5aa038f935168dc25e3
2016-06-20 19:20:17 +00:00
Julia Reynolds
018444ab61 Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d

Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
2016-06-20 19:08:43 +00:00
Julia Reynolds
9bcc04c5db Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04:00
Adrian Roos
6f23c0493a resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
am: fa2bbcc288

Change-Id: Ia76e98cf5b8a94a36d77a326ce37bf31ae34a3bb
2016-06-17 18:55:31 +00:00
Maurice Lam
f438a1a423 Merge \\"Use GLIF theme for Settings > Security > Screen lock\\" into nyc-mr1-dev am: 223d45ea0e
am: 47e38646ed

Change-Id: If8a44dee9ba11281c9cc62b16b3599655c94724a
2016-06-17 18:54:51 +00:00
Adrian Roos
fa2bbcc288 resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
2016-06-16 18:58:04 -07:00
Adrian Roos
bd470255d0 resolve merge conflicts of 333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07:00