Bill Yi
9490c36598
Import translations. DO NOT MERGE
...
Change-Id: Ie0fc2f56d626dffbb2b7ca902d8c327f5a9f544c
Auto-generated-cl: translation import
2017-05-12 17:05:00 -07:00
TreeHugger Robot
1949776c59
Merge "Hide app info link for "All work apps" data usage detail"
2017-05-12 21:31:09 +00:00
Fan Zhang
64ea8403bf
Merge "Add a no-op activity to handle development setting intent." into oc-dev am: 0036ef2cf0
...
am: 2fdb45913b
2017-05-12 20:59:40 +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
Juan Lang
a5f0a82f8f
Merge changes from topic 'footer-settingslib'
...
* changes:
Depend on SettingsLib's version of lifecycle and FooterMixin.
Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +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
b13d0c5d2f
Merge "Update FakeUid to include new methods." into oc-dev am: 129369e58e
...
am: 2c49941e5a
2017-05-12 18:18:33 +00:00
TreeHugger Robot
2270c87100
Merge "Revert "Revert "Filter and display top 3 suggestions for exclusive type"""
2017-05-12 18:14:49 +00:00
Fan Zhang
59fd017ce5
Revert "Revert "Filter and display top 3 suggestions for exclusive type""
...
This reverts commit 184ae963e7
2017-05-12 18:12:58 +00:00
Juan Lang
777ed2535a
Depend on SettingsLib's version of lifecycle and FooterMixin.
...
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.
Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
&& make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
2017-05-12 11:10:46 -07:00
Sudheer Shanka
2c49941e5a
Merge "Update FakeUid to include new methods." into oc-dev
...
am: 129369e58e
2017-05-12 18:09:55 +00:00
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
Sudheer Shanka
129369e58e
Merge "Update FakeUid to include new methods." into oc-dev
2017-05-12 18:02:44 +00:00
TreeHugger Robot
96e6f69597
Merge "Filter and display top 3 suggestions for exclusive type"
2017-05-12 17:28:35 +00:00
Fan Zhang
470caeaa80
Hide app info link for "All work apps" data usage detail
...
We should hide the link because "All work apps" is a meta app, it
doesn't point to any specific app, so app info link does not make sense.
Change-Id: I768786f2df5d05bbde0723e5585abcdbe875c652
Fix: 36542896
Test: make RunSettingsRoboTests
2017-05-12 10:21:33 -07:00
Adrian Roos
9b6b6d8c5e
Merge "AOD: Add temporary always-on setting"
2017-05-12 16:40:10 +00:00
Juan Lang
e1fc16892e
Add a factory method to create a Lifecycle.
...
Some unit tests in other packages want to override the mLifecycle member
with their own value. When the Lifecycle class moves into SettingsLib,
the classpath of ObservableDialogFragment and Lifecycle have to remain
consistent. This change allows dependent classes to remain agnostic to
Lifecycle's classpath.
Test: make RunSettingsGoogleRoboTests && make RunSettingsLibRoboTests &&
make RunSettingsRoboTests
Change-Id: I594e447741aeeb3ba95afb4044d496b1540bd92c
2017-05-12 09:24:20 -07: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
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
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
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
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
