Android Build Merger (Role)
4ccb4fd19e
Merge "Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours am: 1c3120f196" into oc-dev-plus-aosp
2017-05-12 22:22:16 +00:00
Phil Weaver
be70654977
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97
...
am: 8f58e8b6e9
2017-05-12 22:21:56 +00:00
Phil Weaver
4f004a719c
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours
...
am: 1c3120f196
2017-05-12 22:21:56 +00:00
Phil Weaver
1c3120f196
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
...
am: 611fda4a97
2017-05-12 22:19:53 +00:00
Phil Weaver
8f58e8b6e9
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
...
am: 611fda4a97
2017-05-12 22:17:54 +00:00
Phil Weaver
611fda4a97
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239
...
am: 7f1bc85e4c
2017-05-12 22:16:26 +00:00
Phil Weaver
7f1bc85e4c
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a
...
am: 8247008239
2017-05-12 22:14:22 +00:00
Phil Weaver
8247008239
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
...
am: 9b8abd652a
2017-05-12 22:11:56 +00:00
Phil Weaver
9b8abd652a
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4
...
am: adf8f8bc60
2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67
...
am: 11b6279ed4
2017-05-12 22:07:24 +00:00
Doris Ling
071aa6b88b
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
...
am: d821a32b8e
2017-05-12 22:06:32 +00:00
Phil Weaver
11b6279ed4
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
...
am: beb7f31d67
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
...
am: 5d6d70a50e
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e
Don't enable a11y service if scary dialog obscured
...
am: 9a1b4eb21f
2017-05-12 22:00:23 +00:00
TreeHugger Robot
d821a32b8e
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
2017-05-12 21:54:22 +00:00
Fan Zhang
2fdb45913b
Merge "Add a no-op activity to handle development setting intent." into oc-dev
...
am: 0036ef2cf0
2017-05-12 20:42:53 +00:00
TreeHugger Robot
0036ef2cf0
Merge "Add a no-op activity to handle development setting intent." into oc-dev
2017-05-12 20:16:20 +00:00
Sudheer Shanka
2c49941e5a
Merge "Update FakeUid to include new methods." into oc-dev
...
am: 129369e58e
2017-05-12 18:09:55 +00:00
Sudheer Shanka
129369e58e
Merge "Update FakeUid to include new methods." into oc-dev
2017-05-12 18:02:44 +00:00
Doris Ling
2f02218493
Change AppPrefLoader from AsyncTask to AsyncLoader.
...
Showing the wifi data usage results in reaching the max number of
threads in the pool executor. Switching the loader implementation
from Async task to AsynLoader and use a single loader to get the
whole list of preferences instead of using a new task to create each
list element.
Change-Id: I0da19ca09031a7fa178970c192e12a99ab489145
Fix: 33820327
Test: make RunSettingsRoboTests
2017-05-12 10:34:20 -07: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
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
Sudheer Shanka
8f806c0992
Update FakeUid to include new methods.
...
Bug: 34133340
Test: builds
Change-Id: I8c17e80002685e8e5e214d6238084584ae15ea30
2017-05-11 20:56:58 -07: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
Fan Zhang
6359a19c6f
Add a no-op activity to handle development setting intent.
...
This no-op activity is only enabled when the real setting is
turned off.
Change-Id: I7ccf4645054a60569a77076c24cf42da80479fed
Fix: 37651414
Test: rerun CTS test android.systemintents.cts.TestSystemIntents#testSystemIntents
2017-05-11 23:41:29 +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
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
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
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
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
ee8789939e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: f1730bee90
2017-05-11 01:21:10 +00:00
TreeHugger Robot
f1730bee90
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-11 00:30:32 +00:00
Stephen Chen
ac1b935437
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
...
am: 25d1848e5f
2017-05-11 00:22:12 +00:00
Doris Ling
2a23542e68
Merge "Also update the account preferences in displayPreference()." into oc-dev
...
am: cf162d5354
2017-05-11 00:21:31 +00:00
Roozbeh Pournader
3a32750ee6
Merge "Set textDirection of app name to locale direction" into oc-dev
...
am: 319250b1eb
2017-05-11 00:21:06 +00:00
Jesse Evans
28839c0531
Merge "Properly set isInstantApp for power usage page" into oc-dev
...
am: 3c19120945
2017-05-11 00:20:40 +00:00
