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
2016-08-29 13:39:23 +00:00
Geoffrey Pitsch
de67bc9d68
Only show BootSounds preference if has_boot_sounds is true.
...
am: fd351eaaf1
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
2016-08-18 00:50:15 +00:00
Julia Reynolds
c3997cbae1
Display days of week in locale order.
...
am: 0bb60ada96
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
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
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
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
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
2016-06-20 19:20:17 +00:00
Julia Reynolds
018444ab61
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
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
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
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
Adrian Roos
333ba2df01
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
2016-06-16 23:33:56 +00:00
Adrian Roos
38e4e5dca6
Remove RemoteInput on lockscreen setting
...
Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
2016-06-16 13:29:11 -07:00
Maurice Lam
d189ac52a4
Use GLIF theme for Settings > Security > Screen lock
...
Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
2016-06-16 12:13:11 -07:00
Julia Reynolds
7860cb0d0a
Merge \\\"Prevent users from blocking system notifications.\\\" into nyc-dev am: b2301cb4c2 am: f04499b2e1
...
am: a9f6b69398
2016-06-14 22:46:19 +00:00
Julia Reynolds
f04499b2e1
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:19 +00:00
Julia Reynolds
cdd1a26465
Prevent users from blocking system notifications.
...
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134
2016-06-13 12:49:45 -04:00
Ian Rogers
03936cea60
Fix sort orders on longs.
...
The int conversion narrows a long possibly inverting its sign. This may
lead to broken comparator sort orders.
Caught by Error Prone.
Bug: 27723540
Change-Id: I53d70c25a22cdcfc496443395b170f586d259fa7
2016-06-07 00:02:42 -07:00
Julia Reynolds
9782079130
Importance slider updates.
...
Icon & tint.
Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-27 10:00:46 -04:00
Bart Sears
72167fe650
Revert "Importance slider updates."
...
This reverts commit 373a9e2fcf
2016-05-27 04:47:02 +00:00
Julia Reynolds
b0f0d299cf
Merge "Importance slider updates." into nyc-dev
...
am: 7c2c025e4f
2016-05-27 04:04:31 +00:00
Julia Reynolds
373a9e2fcf
Importance slider updates.
...
Icon & tint.
Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-26 11:08:16 -04:00
Andrew Sapperstein
7232e4f7ee
More theming fixes.
...
Updated the importance seekbar to use colorAccent instead of a hardcoded
color.
Refactored the various gear icons to all use ic_settings (a rename of
ic_bt_config). Deleted the png version (ic_sysbar_quicksettings).
Cleaned up the add icon. Now there are two vector drawables (one white,
one tinted with the accent color). Deleted the existing pngs and updated
the usages to use one of the two vector drawables. Deleted the theme
attr for ic_menu_add that had no usages.
BUG: 28760785
Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3
2016-05-25 10:55:11 -07:00
Julia Reynolds
992422fd5e
Catch rule creation exceptions.
...
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
2016-05-16 09:53:23 -04:00
Adrian Roos
ef505d628a
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
2016-05-12 20:52:25 +00:00
