Fan Zhang
e19209a42c
Merge "Revert "Filter and display top 3 suggestions for exclusive type""
2017-05-12 18:06:51 +00:00
Fan Zhang
184ae963e7
Revert "Filter and display top 3 suggestions for exclusive type"
...
This reverts commit 70b634adcf
2017-05-12 18:03:58 +00:00
TreeHugger Robot
96e6f69597
Merge "Filter and display top 3 suggestions for exclusive type"
2017-05-12 17:28:35 +00:00
Adrian Roos
9b6b6d8c5e
Merge "AOD: Add temporary always-on setting"
2017-05-12 16:40:10 +00:00
Fan Zhang
70b634adcf
Filter and display top 3 suggestions for exclusive type
...
Change-Id: Ief4c2f02fcf1064dac3659502bd7511b09a2a7df
Fix: 37947647
Test: make RunSettingsRoboTests
2017-05-12 08:47:39 -07:00
Julia Reynolds
5b1bc2acad
Merge "Notification settings, importance and pre-O apps" into oc-dev am: 6393e1752f
...
am: 237eb88434
2017-05-12 12:28:35 +00:00
Julia Reynolds
237eb88434
Merge "Notification settings, importance and pre-O apps" into oc-dev
...
am: 6393e1752f
2017-05-12 12:20:36 +00:00
Julia Reynolds
6393e1752f
Merge "Notification settings, importance and pre-O apps" into oc-dev
2017-05-12 12:14:11 +00:00
Amin Shaikh
04f40e3b45
Merge changes from topic 'onarevert' into oc-dev am: b747be0769
...
am: 8485562ded
2017-05-12 09:00:33 +00:00
Amin Shaikh
1383a9e882
Revert "Update "Open networks available" toggle to instead open notification channel preferences." am: dfa9bb8914
...
am: c3666f1c35
2017-05-12 09:00:24 +00:00
Matthew Fritze
031bb4e3a5
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am: b38c1e5353
...
am: 01f5f5d5c9
2017-05-12 08:59:41 +00:00
Chris Wren
fed86ddf91
Merge "add a global control for badging" into oc-dev am: 1425b91bac
...
am: aebf049b4f
2017-05-12 08:59:11 +00:00
jackqdyulei
4f93c27831
Merge "Add animation for battery asyncLoader." into oc-dev am: 6c680a36c5
...
am: 4b749c2b0a
2017-05-12 08:58:41 +00:00
Doris Ling
d523a72f76
Merge "Fix crash when activity not attached after search index finishes." into oc-dev am: d3e33ebcef
...
am: 93ff2d69f1
2017-05-12 08:58:02 +00:00
Chris Wren
0e06c31bae
Merge "allow secondary users to use notification settings" into oc-dev am: 72cc7b7915
...
am: 715f096678
2017-05-12 08:57:05 +00:00
Amin Shaikh
8485562ded
Merge changes from topic 'onarevert' into oc-dev
...
am: b747be0769
2017-05-12 06:48:13 +00:00
Amin Shaikh
c3666f1c35
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
am: dfa9bb8914
2017-05-12 06:48:04 +00:00
Matthew Fritze
01f5f5d5c9
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
...
am: b38c1e5353
2017-05-12 06:46:32 +00:00
Chris Wren
aebf049b4f
Merge "add a global control for badging" into oc-dev
...
am: 1425b91bac
2017-05-12 05:57:49 +00:00
jackqdyulei
4b749c2b0a
Merge "Add animation for battery asyncLoader." into oc-dev
...
am: 6c680a36c5
2017-05-12 04:58:12 +00:00
Doris Ling
93ff2d69f1
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
...
am: d3e33ebcef
2017-05-12 04:57:40 +00:00
Chris Wren
715f096678
Merge "allow secondary users to use notification settings" into oc-dev
...
am: 72cc7b7915
2017-05-12 04:57:08 +00:00
TreeHugger Robot
b747be0769
Merge changes from topic 'onarevert' into oc-dev
...
* changes:
Update "Open networks available" setting.
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
2017-05-12 04:40:27 +00:00
TreeHugger Robot
b38c1e5353
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
2017-05-12 02:04:38 +00:00
Chris Wren
1425b91bac
Merge "add a global control for badging" into oc-dev
2017-05-12 01:49:07 +00:00
TreeHugger Robot
6c680a36c5
Merge "Add animation for battery asyncLoader." into oc-dev
2017-05-12 01:35:23 +00:00
TreeHugger Robot
d3e33ebcef
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
2017-05-12 01:31:21 +00:00
Adrian Roos
95ff1f4131
AOD: Add temporary always-on setting
...
Adds a setting for controlling always-on ambient display
until the new ambient display settings screen is implemented.
Also updates DozePreferenceController to use the the
AmbientDisplayConfiguration helper instead of recreating that
logic.
Also adds tests for both doze preference controllers.
Bug: 33279975
Test: Toggle "Settings > Display > Always on", verify ambient display is on / off
Test: make RunSettingsRoboTests
Change-Id: If36356bc29329a4e0732e79db662ffb02c9fc189
2017-05-11 17:15:20 -07:00
TreeHugger Robot
631120f1ad
Merge "Add bluetooth visible item"
2017-05-11 23:45:29 +00:00
TreeHugger Robot
b823fcc431
Merge "Add animation for battery asyncLoader."
2017-05-11 23:07:00 +00:00
TreeHugger Robot
eb9c9fb569
Merge "Refactor choose lock password scrolling"
2017-05-11 22:41:15 +00:00
jackqdyulei
a3c528f64d
Add animation for battery asyncLoader.
...
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 15:27:23 -07:00
Bill Yi
f36cf55b94
Merge "Import translations. DO NOT MERGE"
2017-05-11 21:47:42 +00:00
Chris Wren
72cc7b7915
Merge "allow secondary users to use notification settings" into oc-dev
2017-05-11 21:31:46 +00:00
Chris Wren
485e75e063
add a global control for badging
...
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04:00
Maurice Lam
c41e408aea
Refactor choose lock password scrolling
...
Replace the negative margin + inset background hack with a overriding
call to requestRectangleOnScreen, which will also make a best effort
to show all the password requirements if there are multiple of them.
Bug: 38236574
Test: Added ScrollToParentEditTextTest
Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
2017-05-11 19:26:12 +00:00
Maurice Lam
3ffdc4d15b
Merge "Check for sidecar null-ness before removing" into oc-dev am: 59f965d698
...
am: 7e60ce0109
2017-05-11 18:52:45 +00:00
Julia Reynolds
2f0547c783
Notification settings, importance and pre-O apps
...
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance
Fixes: 38177887
Bug: 38120923
Fixes: 38012300
Fixes: 37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
2017-05-11 14:48:17 -04:00
Maurice Lam
7e60ce0109
Merge "Check for sidecar null-ness before removing" into oc-dev
...
am: 59f965d698
2017-05-11 18:20:19 +00:00
jackqdyulei
ae86781edd
Add bluetooth visible item
...
Show "Visible as [Device name]". Also remove the menuitem for
changing device name.
This cl creates a preference controller to handle the logic for
device name preference.
Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I9ab6c9d2df5b053d15b8ff887073ef82616243a4
2017-05-11 11:12:25 -07:00
Bill Yi
57fa84ccfd
Import translations. DO NOT MERGE
...
Change-Id: I7847ecf70524ecfc31bc2a661d7d4630b5e980b3
Auto-generated-cl: translation import
2017-05-11 11:10:10 -07:00
Chris Wren
9749835904
allow secondary users to use notification settings
...
Bug: 38197667
Test: manual
Change-Id: Ib3b5f865eccc4e47ea00b190e402c3668559f427
2017-05-11 17:51:43 +00:00
Maurice Lam
59f965d698
Merge "Check for sidecar null-ness before removing" into oc-dev
2017-05-11 17:35:17 +00:00
jackqdyulei
14dcca0e91
Add animation for battery asyncLoader.
...
Fix merge conflict from oc-dev
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 10:05:33 -07:00
Matthew Fritze
e2cb72fa7f
Remove dynamic summaries for "On the lockscreen"
...
Bug:36101902
Test: make RunSettingsRoboTests
Change-Id: Ie004f07f4c543a99c2b2ad1e5d7c8b2ef49246d5
2017-05-11 08:54:31 -07:00
Bill Yi
6f33a52d32
Merge "Import translations. DO NOT MERGE" into oc-dev am: f1730bee90 -s ours
...
am: ee8789939e
2017-05-11 11:50:09 +00:00
Stephen Chen
9eecfb3de7
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am: 25d1848e5f
...
am: ac1b935437
2017-05-11 06:18:36 +00:00
Bill Yi
ee8789939e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: f1730bee90
2017-05-11 01:21:10 +00:00
Doris Ling
1886fe1bae
Merge "Also update the account preferences in displayPreference()." into oc-dev am: cf162d5354
...
am: 2a23542e68
2017-05-11 01:04:40 +00:00
Roozbeh Pournader
d0f3d716a3
Merge "Set textDirection of app name to locale direction" into oc-dev am: 319250b1eb
...
am: 3a32750ee6
2017-05-11 01:04:05 +00:00
