Fengjen Wu
63cb104551
Merge "Add divider line in Multiple users screen" into pi-dev am: 1a7e4daa95
...
am: f727a0ab12
2018-03-21 09:40:35 +00:00
Shawn Ding
b9260ae13e
Merge "Update string for "Use vibrator" setting" into pi-dev am: c5491014ab
...
am: ddf17c73bb
2018-03-21 09:40:08 +00:00
Will Chen
0e8431d1b9
Merge "Remove period on "Fingerprint added" screen" into pi-dev am: f61edcc7f8
...
am: d86798231d
2018-03-21 09:39:31 +00:00
Jan Nordqvist
b58ae73c15
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev am: 9055c1b655
...
am: 2adf86a3c7
2018-03-21 09:38:22 +00:00
Fan Zhang
eeae927349
Merge "Remove hardcoded wrong summary" into pi-dev am: f089fb2413
...
am: e435f2cd1e
2018-03-21 08:30:10 +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
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
2adf86a3c7
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev
...
am: 9055c1b655
2018-03-21 06:09:52 +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
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
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
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
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
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
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
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
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
Jan Nordqvist
dde458c031
Fixed "Primary data" text style and rearranged UI vertically.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5848f8b499aaac911c61860aa1471c9d391614bb
2018-03-20 13:49:58 -07: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
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
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
TreeHugger Robot
a3970d4e52
Merge "Remove LinearColorBar and replace uses with ProgressBar." into pi-dev
2018-03-20 17:11:51 +00:00
Pavel Grafov
72137f3aad
Remove "don't show" option from work notifications settings
...
Option to not show notifications is still available for
device-wide locks screen notification settings.
Also s/On lock screen/When work profile is locked/ for work
notifications since it applies not only to lock screen but to
notification shade as well.
Bug: 64829587
Test: make RunSettingsRoboTests
Change-Id: Ie3ec461f4c8887a5a49cd92b5350ea683f701027
2018-03-20 16:39:29 +00:00
