Beverly
f1e4e4fdd3
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am: 268c6c6ca6
...
am: 7ba9e9f849
2017-08-18 14:19:20 +00:00
TreeHugger Robot
268c6c6ca6
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
2017-08-18 14:08:24 +00:00
Fan Zhang
5bfe4c4309
Merge "Suppress some search results" into oc-mr1-dev am: f51b4a580f
...
am: f8817000ac
2017-08-17 07:18:10 +00:00
TreeHugger Robot
f51b4a580f
Merge "Suppress some search results" into oc-mr1-dev
2017-08-17 01:20:42 +00:00
Fan Zhang
83eaff5e4a
Suppress some search results
...
Fixes: 62137086
Test: reindex search
Test: robotests
Change-Id: I12e873edade80e4c0007d10352fb037b3230c643
2017-08-16 22:25:29 +00:00
Beverly
949d813715
Null-pointer check when updating name of ZenRule.
...
Test: manual, current tests pass
Fixes: 64758679
Change-Id: Ia94b1749afdc6db4780bd09a5794f4110d4d032d
2017-08-16 15:47:27 -04:00
Doris Ling
9906395fa3
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev am: db56114b34
...
am: 3503851ee1
2017-08-10 02:32:36 +00:00
qqzhou
bef7e0de9d
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 467aad4219
...
am: add20708ba
2017-08-10 02:25:22 +00:00
TreeHugger Robot
db56114b34
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
2017-08-10 01:41:45 +00:00
qqzhou
467aad4219
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 22:41:12 +00:00
Doris Ling
b7490bea28
Initialize the volume seekbar preference max and progress.
...
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.
Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix: 34035654
Test: make RunSettingsRoboTests
2017-08-09 13:56:13 -07:00
qqzhou
c18c517467
Settings: Fix NPE in ChannelNotificationSettings
...
java.lang.NullPointerException: Attempt to invoke virtual method 'int
android.app.NotificationChannel.getImportance()' on a null object
reference at com.android.settings.notification.ChannelNotificationSettings.
onActivityResult.
Change-Id: I3ec7b51e2533dc108b1a14c151e3ad70d22113e5
CRs-Fixed: 2068192
Fixes: 64116799
Fixes: 64134707
Test: monkey
2017-08-09 11:38:58 -04:00
Julia Reynolds
cad51d7753
Merge "Use colorful +s" into oc-mr1-dev am: e286c0627b
...
am: 5d17c4284d
2017-08-09 14:17:57 +00:00
Julia Reynolds
fabe766958
Use colorful +s
...
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes: 63820885
Test: manual
2017-08-08 14:00:09 -04:00
Beverly
90da133162
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am: 7fc4dd7e7b
...
am: 793e3641c0
2017-08-07 17:27:17 +00:00
Beverly
2aeff818c8
Uninstall app through notif closes app settings.
...
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
2017-08-07 14:21:36 +00:00
Eugene Susla
d004a96c5b
[Companion] Make notification dialog non-cancelable
...
Bug: 63405718
Test: Ensute that the notification access dialog is not dismissable with
either back button or touch outside
Change-Id: I613da247a2adc0571478f649a2191cd5840359f0
2017-08-02 20:06:50 -07:00
jackqdyulei
c50495ba06
Add ResultPayload for Allow notification dots
...
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
Merged-In: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-27 16:53:40 -07:00
jackqdyulei
aa5618fd82
Add ResultPayload for Allow notification dots
...
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-26 17:55:11 -07:00
Julia Reynolds
4faa353f02
Zen settings screen update
...
am: 56b748d686
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686
Zen settings screen update
...
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00
Julia Reynolds
b49578e485
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
2017-07-20 14:23:51 +00:00
Julia Reynolds
33e8223fe2
Merge "Add separator to auto zen rule listing." into oc-dr1-dev am: afe4ce0927
...
am: 92f2cd5055
2017-07-19 16:50:55 +00:00
Fan Zhang
465d79776f
Improve search indexing time.
...
- Some import clean up.
- Add timing log to track indexing time breakdown.
- Remove isAvailable() from UserDictionaryPreferenceController.
Bug: 36391685
Test: rebuild
Change-Id: If154c5dafba5d21cb1020497c44fbf67f03ad820
2017-07-18 14:53:49 -07:00
Julia Reynolds
78f612b823
Zen priority settings update
...
Reordering & adding summary
Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes: 63712680
Test: RunSettingsRoboTests
2017-07-18 10:50:14 -04:00
Julia Reynolds
fdd294ef4c
Add separator to auto zen rule listing.
...
Test: manual
Change-Id: I9c3549832693d483ec5f0cf72a50909c18483fbb
Fixes: 63681398
2017-07-18 10:49:21 -04:00
Julia Reynolds
153578ebc3
Merge "Remove automatic rule icons" into oc-dr1-dev am: 0ed32cae99
...
am: 1f14e49fa5
2017-07-14 16:54:58 +00:00
Julia Reynolds
1c3a291ffb
Remove automatic rule icons
...
Test: code inspection
Change-Id: I7e585f485d3ba9318bf533e07e9fa7f1e1874d51
Fixes: 63623747
2017-07-14 10:03:56 -04:00
Fan Zhang
75bee9bf98
App header cleanup
...
- Refactor the entity header layout to use LinearLayout and add id to
content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference
Fix: 62705377
Test: make RunSettingsRoboTests
Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
TreeHugger Robot
b5ef73ebcb
Merge "Add ordering attribute to sound setting preferences."
2017-06-29 17:12:36 +00:00
Maurice Lam
21bd3994c4
Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7
...
am: d3d1210fad
2017-06-29 02:07:19 +00:00
Fan Zhang
2e72dda1aa
Add ordering attribute to sound setting preferences.
...
The ordering helps injected settings show up before work profile
settings.
Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix: 62997256
Test: visual
2017-06-28 18:14:18 -07:00
Maurice Lam
9990f39722
Read theme for lock screen flows
...
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.
Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
2017-06-28 15:06:09 -07:00
Tony Mantler
1d583e125f
Make PreferenceController a mixin
...
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Julia Reynolds
559bd3651e
Disable managed services special access screens...
...
... on low ram devices.
- Remove them from the 'Special app access' screen
- Display an error message if an app intents directly to
them
Bug: 35219985
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java,
when the device is in low ram mode and when it's not.
Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac
2017-06-23 15:44:43 -04:00
Alison Cichowlas
4fe455de57
Notification settings to match ixd mocks:
...
- added default sound config to general notification settings page
- reordered items to match docs
Bug: 37481153
Test: RunSettingsRoboTests; manual
Change-Id: I2404f0a3f97601c8b3a9d15de58e1d53bf801c45
2017-06-22 10:44:27 -04:00
Julia Reynolds
c429ffb592
Merge "Migrate from setting to NotificationManager."
2017-06-19 17:59:03 +00:00
Alison Cichowlas
1a74eefb54
Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
...
am: eeda4ae540
2017-06-19 15:15:31 +00:00
Alison Cichowlas
7b0a8b6815
Notification settings update.
...
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug: 62705435
Test: make RunSettingsRoboTests; manual verification
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
2017-06-19 08:53:45 -04:00
Fan Zhang
fdcb8b1dc8
Hide app info button from app notification settings header
...
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit 5d811c40d3
2017-06-16 22:30:31 +00:00
Fan Zhang
5d811c40d3
Hide app info button from app notification settings header
...
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 13:12:44 -07:00
Alison Cichowlas
d58d342967
Add separator line in notification settings,
...
above link to in-app settings.
Test: make RunSettingsRoboTests
Bug: 62543732
Change-Id: Ibf4f08c3d5feba90598d71f48c050e87ab9c3fdf
2017-06-15 15:11:19 +00:00
Julia Reynolds
ee4b6ba6ae
Migrate from setting to NotificationManager.
...
Test: manual; changing settings and confirming with bugreport
Change-Id: I1595fc3ceca8cd31d5bece52dff75aebe29d2ae3
2017-06-14 11:34:47 -04:00
Alison Cichowlas
665384a8eb
Limit unconfigurability to specified channels.
...
am: 80fa6b5833
2017-06-13 01:45:10 +00:00
Alison Cichowlas
80fa6b5833
Limit unconfigurability to specified channels.
...
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 23:17:11 +00:00
Alison Cichowlas
bbd4fc124a
Limit unconfigurability to specified channels.
...
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 13:44:38 -04:00
Alison Cichowlas
a90a144ef3
Merge "If two groups are posted to settings, remove old group and log." into oc-dev am: 9fa5e66a66
...
am: 59b4e5b6c4
2017-06-07 00:11:08 +00:00
TreeHugger Robot
9fa5e66a66
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
2017-06-06 23:34:44 +00:00
Alison Cichowlas
130a028f33
If two groups are posted to settings, remove old group and log.
...
Bug: 62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
2017-06-06 17:02:23 -04:00
Matthew Fritze
84ef9daa4f
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am: b8028f63ec
...
am: 64736b6ae1
2017-06-06 18:13:41 +00:00
