Fan Zhang
eeae927349
Merge "Remove hardcoded wrong summary" into pi-dev am: f089fb2413
...
am: e435f2cd1e
2018-03-21 08:30:10 +00:00
Fan Zhang
e435f2cd1e
Merge "Remove hardcoded wrong summary" into pi-dev
...
am: f089fb2413
2018-03-21 05:30:32 +00:00
Matthew Fritze
527be21e9b
Merge "Index SliceType and Official Platform flag" into pi-dev am: f663d78436
...
am: 467b47be5f
2018-03-21 04:33:12 +00:00
Makoto Onuki
3b4cd7410b
Merge "Remove battery saver toggle from the Battery screen" into pi-dev am: 83c8451266
...
am: 2ef1dcafa5
2018-03-21 04:20:40 +00:00
Ben Lin
8557c55e7b
Merge "Add Default backup page to list of allowed fragments." into pi-dev am: 048b71a67c
...
am: 4ff1e8fce2
2018-03-21 04:06:29 +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
Lei Yu
2d6cddb172
Merge "Add log for battery tip action." into pi-dev am: 09ed2f2596
...
am: 291a640420
2018-03-21 01:21:36 +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
Maggie Wang
21f9b47884
Merge "Add an Advanced button to location settings" into pi-dev am: ff912223b7
...
am: b5f4aa911a
2018-03-21 01:11:13 +00:00
Tony Mak
1b8ee6f122
Merge "Fix user id is not used correctly when fetching app info" into pi-dev am: ea43e8285e
...
am: e33a04e278
2018-03-21 00:53:18 +00:00
TreeHugger Robot
f089fb2413
Merge "Remove hardcoded wrong summary" into pi-dev
2018-03-21 00:28:52 +00:00
Phil Weaver
118c2b0d1c
Merge "Indicate when accessibility services have stopped" into pi-dev am: 656aad9c93
...
am: 9eb8ba1b6f
2018-03-21 00:06:20 +00:00
Salvador Martinez
457f75a139
Merge "Update metered string" into pi-dev am: f9dade022c
...
am: b07afe0538
2018-03-21 00:05:45 +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
Hansong Zhang
97128f86d6
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev am: 012e04fa02
...
am: fbd3076a84
2018-03-20 23:23:18 +00:00
Antoan Angelov
92cc5fa977
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev am: 1bc98edc15
...
am: 2465019035
2018-03-20 23:22:40 +00:00
Qingxi Li
e08fdbe27b
Merge "UI Tweak for eSIM related" into pi-dev am: 2a6b9ff315
...
am: c3d81ef8ab
2018-03-20 23:22:13 +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
Pavel Grafov
78fc22ff6b
Merge "Remove "don't show" option from work notifications settings" into pi-dev am: be3e5caa7f
...
am: dfd74e5b1a
2018-03-20 22:10:33 +00:00
Chad Brubaker
803340d27d
Merge "Fix lockdown string" into pi-dev am: 91b6d17b8d
...
am: f74a874dda
2018-03-20 22:00:34 +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
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
TreeHugger Robot
09ed2f2596
Merge "Add log for battery tip action." into pi-dev
2018-03-20 21:11:41 +00:00
Maggie Wang
ff912223b7
Merge "Add an Advanced button to location settings" into pi-dev
2018-03-20 20:44:23 +00:00
Andrew Sapperstein
54762c6ff7
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev am: a3970d4e52
...
am: e95d9f34f7
2018-03-20 20:28:44 +00:00
Pavel Grafov
dfd74e5b1a
Merge "Remove "don't show" option from work notifications settings" into pi-dev
...
am: be3e5caa7f
2018-03-20 20:24:22 +00:00
TreeHugger Robot
ea43e8285e
Merge "Fix user id is not used correctly when fetching app info" into pi-dev
2018-03-20 20:24:17 +00:00
TreeHugger Robot
656aad9c93
Merge "Indicate when accessibility services have stopped" into pi-dev
2018-03-20 20:16:09 +00:00
TreeHugger Robot
f9dade022c
Merge "Update metered string" into pi-dev
2018-03-20 20:05:07 +00:00
TreeHugger Robot
012e04fa02
Merge "Move the setActiveDevice logic from Settings to SettingsLib (2/2)" into pi-dev
2018-03-20 19:56:51 +00:00
Antoan Angelov
1bc98edc15
Merge "Show "Doesn't support work profiles" text in Settings for launchers not supporting work profiles." into pi-dev
2018-03-20 19:33:17 +00:00
Chad Brubaker
f74a874dda
Merge "Fix lockdown string" into pi-dev
...
am: 91b6d17b8d
2018-03-20 19:30:27 +00:00
TreeHugger Robot
2a6b9ff315
Merge "UI Tweak for eSIM related" into pi-dev
2018-03-20 19:24:59 +00:00
Andrew Sapperstein
e95d9f34f7
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
...
am: a3970d4e52
2018-03-20 19:10:46 +00:00
TreeHugger Robot
be3e5caa7f
Merge "Remove "don't show" option from work notifications settings" into pi-dev
2018-03-20 18:41:13 +00:00
TreeHugger Robot
91b6d17b8d
Merge "Fix lockdown string" into pi-dev
2018-03-20 18:19:09 +00:00
Maggie
6f2741d50b
Add an Advanced button to location settings
...
Add an Advanced button under "recent location requests" and "app level
permissions" in location settings.
Location footer should still be visible under Advanced button.
Bug: 70350519
Test: Manual
Change-Id: I5db32e911ed6527048c625f691f5476eb77751b3
2018-03-20 10:57:37 -07:00
Salvador Martinez
aea566d44e
Update metered string
...
This CL updates the metered network string to say
'detect automatically' instead of 'network preference'
Bug: 68030417
Test: rototest, visual inspection
Change-Id: I347e3b89b014d7ec0d5d0e6601f2813a3a96f5ab
2018-03-20 10:55:00 -07:00
Hansong Zhang
02acba607a
Move the setActiveDevice logic from Settings to SettingsLib (2/2)
...
Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.
Bug: 75984255
Test: robolectric test
Change-Id: I5742de1463d156ff29708ea2aecfc3fd00795e9e
2018-03-20 10:43:15 -07:00
TreeHugger Robot
a3970d4e52
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
2018-03-20 17:11:51 +00:00
