Lei Yu
ca5e641d0b
Merge "Get anomalyType and autoRestriction from config" into pi-dev
...
am: 940630bae1
2018-03-21 19:38:07 +00:00
Andrew Sapperstein
4b6cdc6b04
Merge "Update material_deep_teal_500 to #008577." into pi-dev
...
am: 3749a8d871
2018-03-21 18:44:38 +00:00
Philip P. Moltmann
57a64606da
Merge "Recover print job ID from intent extras" into pi-dev
...
am: 61e6b87e7d
2018-03-21 18:43:53 +00:00
Jyun LuoLai
73af1f3fb7
Merge "Modify connectivty related strings" into pi-dev
...
am: 346a36cd2e
2018-03-21 18:43:26 +00:00
Fan Zhang
2049dbcb8a
Merge "Remove SettingsLaunchPerformance test" into pi-dev
...
am: 10420706e6
2018-03-21 18:42:56 +00:00
TreeHugger Robot
940630bae1
Merge "Get anomalyType and autoRestriction from config" into pi-dev
2018-03-21 17:46:50 +00:00
TreeHugger Robot
3749a8d871
Merge "Update material_deep_teal_500 to #008577." into pi-dev
2018-03-21 17:45:25 +00:00
TreeHugger Robot
61e6b87e7d
Merge "Recover print job ID from intent extras" into pi-dev
2018-03-21 17:29:35 +00:00
TreeHugger Robot
346a36cd2e
Merge "Modify connectivty related strings" into pi-dev
2018-03-21 17:14:20 +00:00
Fan Zhang
10420706e6
Merge "Remove SettingsLaunchPerformance test" into pi-dev
2018-03-21 16:53:47 +00:00
Pavel Grafov
35b901c97f
Merge "Move work profile notification settings to the bottom." into pi-dev
...
am: d174ceb27b
2018-03-21 15:26:37 +00:00
Yohei Yukawa
e61ce6008b
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev
...
am: cb601396d4
2018-03-21 15:21:01 +00:00
Philip P. Moltmann
b85ab7e979
Recover print job ID from intent extras
...
If the fragment was started via ACTION_PRINT_SETTINGS the intent extra
does not get transformed into a fragment argument. Hence need to check
the intent extra.
Fixes: 74456525
Test: Opened print job settings from a print notification,
atest com.android.settings.print.PrintJobSettingsActivityTest
Change-Id: I6c4605309c348456a862c4d7b48a11400b62fb70
2018-03-21 08:13:45 -07:00
TreeHugger Robot
d174ceb27b
Merge "Move work profile notification settings to the bottom." into pi-dev
2018-03-21 15:01:33 +00:00
TreeHugger Robot
cb601396d4
Merge "Logically revert "Directly show the layout selection screen."" into pi-dev
2018-03-21 15:01:11 +00:00
Ben Lin
f3f2a2065e
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
...
am: b8dec9c8a9
2018-03-21 06:59:53 +00:00
Fengjen Wu
f727a0ab12
Merge "Add divider line in Multiple users screen" into pi-dev
...
am: 1a7e4daa95
2018-03-21 06:37:17 +00:00
Shawn Ding
ddf17c73bb
Merge "Update string for "Use vibrator" setting" into pi-dev
...
am: c5491014ab
2018-03-21 06:32:18 +00:00
Bill Yi
60587b45b1
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
...
am: 265e3da2f3
2018-03-21 06:27:18 +00:00
Will Chen
d86798231d
Merge "Remove period on "Fingerprint added" screen" into pi-dev
...
am: f61edcc7f8
2018-03-21 06:23:34 +00:00
Jan Nordqvist
dd5deaa0e3
Merge "Remove the overflow menu from the usage Appbar." into pi-dev
...
am: 09d1588a07
2018-03-21 06:18:12 +00:00
Jan Nordqvist
2adf86a3c7
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev
...
am: 9055c1b655
2018-03-21 06:09:52 +00:00
Ben Lin
b8dec9c8a9
Merge "Add ability to open up "Open by default" page directly via intent." into pi-dev
2018-03-21 06:07:45 +00:00
Fan Zhang
e435f2cd1e
Merge "Remove hardcoded wrong summary" into pi-dev
...
am: f089fb2413
2018-03-21 05:30:32 +00:00
Fengjen Wu
1a7e4daa95
Merge "Add divider line in Multiple users screen" into pi-dev
2018-03-21 03:21:12 +00:00
TreeHugger Robot
c5491014ab
Merge "Update string for "Use vibrator" setting" into pi-dev
2018-03-21 03:18:04 +00:00
TreeHugger Robot
265e3da2f3
Merge "Revert "Import translations. DO NOT MERGE"" into pi-dev
2018-03-21 03:06:10 +00:00
Will Chen
f61edcc7f8
Merge "Remove period on "Fingerprint added" screen" into pi-dev
2018-03-21 02:04:37 +00:00
Matthew Fritze
467b47be5f
Merge "Index SliceType and Official Platform flag" into pi-dev
...
am: f663d78436
2018-03-21 02:03:35 +00:00
Makoto Onuki
2ef1dcafa5
Merge "Remove battery saver toggle from the Battery screen" into pi-dev
...
am: 83c8451266
2018-03-21 01:54:51 +00:00
Ben Lin
4ff1e8fce2
Merge "Add Default backup page to list of allowed fragments." into pi-dev
...
am: 048b71a67c
2018-03-21 01:18:44 +00:00
Lei Yu
baf8a0cf9e
Get anomalyType and autoRestriction from config
...
Now the westworld config provides COOKIES to store private info
for each alert(anomaly). So we could use it to store:
1. AnomalyType: what is the type of anomaly
2. AutoRestriction: whether to auto restrict this anomaly
Bug: 74567790
Test: RunSettingsRoboTests
Change-Id: I15f5e225a4cb1f2da3fe109e56e5222816d179cc
2018-03-20 17:50:44 -07:00
TreeHugger Robot
09d1588a07
Merge "Remove the overflow menu from the usage Appbar." into pi-dev
2018-03-21 00:44:09 +00:00
TreeHugger Robot
9055c1b655
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev
2018-03-21 00:39:20 +00:00
Bill Yi
836ccd1b95
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 5b57d1d1cb
2018-03-21 00:35:50 +00:00
TreeHugger Robot
f089fb2413
Merge "Remove hardcoded wrong summary" into pi-dev
2018-03-21 00:28:52 +00:00
Lei Yu
291a640420
Merge "Add log for battery tip action." into pi-dev
...
am: 09ed2f2596
2018-03-20 23:37:52 +00:00
TreeHugger Robot
f663d78436
Merge "Index SliceType and Official Platform flag" into pi-dev
2018-03-20 23:31:03 +00:00
Maggie Wang
b5f4aa911a
Merge "Add an Advanced button to location settings" into pi-dev
...
am: ff912223b7
2018-03-20 23:28:01 +00:00
TreeHugger Robot
83c8451266
Merge "Remove battery saver toggle from the Battery screen" into pi-dev
2018-03-20 23:21:17 +00:00
Tony Mak
e33a04e278
Merge "Fix user id is not used correctly when fetching app info" into pi-dev
...
am: ea43e8285e
2018-03-20 22:56:51 +00:00
Ben Lin
048b71a67c
Merge "Add Default backup page to list of allowed fragments." into pi-dev
2018-03-20 22:22:18 +00:00
Fan Zhang
b5241a117f
Remove hardcoded wrong summary
...
Change-Id: Ie96ec9387d77eccad404e3cc81bd0b48299f1c96
Fixes: 75260788
Test: reindexed search and manually search
2018-03-20 15:00:28 -07:00
Phil Weaver
9eb8ba1b6f
Merge "Indicate when accessibility services have stopped" into pi-dev
...
am: 656aad9c93
2018-03-20 21:52:56 +00:00
Salvador Martinez
b07afe0538
Merge "Update metered string" into pi-dev
...
am: f9dade022c
2018-03-20 21:51:43 +00:00
Jan Nordqvist
e22f79139a
Remove the overflow menu from the usage Appbar.
...
In Data Usage screen, Above the data bar, Remove the overflow
menu (3 dots on top right of the screen) from the Appbar.
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4e8a5e54b1e5c573496ff2a76a5a80da38650f2b
2018-03-20 14:49:15 -07:00
Hansong Zhang
fbd3076a84
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
...
am: 012e04fa02
2018-03-20 21:35:05 +00:00
Antoan Angelov
2465019035
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
...
am: 1bc98edc15
2018-03-20 21:34:22 +00:00
Qingxi Li
c3d81ef8ab
Merge "UI Tweak for eSIM related" into pi-dev
...
am: 2a6b9ff315
2018-03-20 21:33:53 +00:00
Makoto Onuki
f310f7e300
Remove battery saver toggle from the Battery screen
...
- Also fix bug where the summary doesn't show up until the battery saver state
changes.
Bug: 74120126
Fix: 74400918
Test: manual
Test: b ROBOTEST_FILTER=BatterySaverControllerTest RunSettingsRoboTests
Change-Id: I03ceb8ee2a8d8c33da7ad220148ecc9553911661
2018-03-20 14:33:32 -07:00
