Julia Reynolds
5d419a2dcf
Merge "Link to dnd settings from notification settings" into pi-dev
2018-03-16 19:43:38 +00:00
Lei Yu
0bd76013f2
Merge "update strings in battery settings(Round 1)" into pi-dev am: cf0cae785f
...
am: dd4a47f940
Change-Id: I4b733b279865ece8c64b0536a8ae6000a6d98752
2018-03-16 19:13:22 +00:00
Lei Yu
dd4a47f940
Merge "update strings in battery settings(Round 1)" into pi-dev
...
am: cf0cae785f
Change-Id: I5a31629dadc6a6119327dc3ba87890670788ce2f
2018-03-16 18:53:53 +00:00
Lei Yu
cf0cae785f
Merge "update strings in battery settings(Round 1)" into pi-dev
2018-03-16 18:26:49 +00:00
Lei Yu
9a80d6ebb8
Update the mechanism to upload new anomaly config
...
1. Move the config update to jobscheduler, so config is checked and
updated every day.
2. Before the update, always delete the old config.
3. Move uploadIntent method to BatteryTipUtils.
Bug: 74997752
Fixes: 74564143
Test: RunSettingsRoboTests
Change-Id: If88759595d57a562b25542082f895fe8f207acdb
2018-03-16 11:24:14 -07:00
Jan Nordqvist
87501f8165
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev am: 6b65ffaab7
...
am: b1d3e89372
Change-Id: I6c4045aed589dc4f11a70cb8c4475357052ce12b
2018-03-16 17:46:54 +00:00
Jan Nordqvist
b1d3e89372
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
...
am: 6b65ffaab7
Change-Id: Ia31548ee407a5a32033f5967d948bd34e5e63049
2018-03-16 17:38:23 +00:00
Jan Nordqvist
6b65ffaab7
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
2018-03-16 17:18:37 +00:00
Julia Reynolds
c35d9b613e
Link to dnd settings from notification settings
...
Test: make -j20 RunSettingsRoboTests
Change-Id: Idf70155134b2e78bd410468497cabe8faf1557ce
Fixes: 74319354
2018-03-16 13:14:03 -04:00
Julia Reynolds
bbcc221a87
Merge "Fix channel screen launching" into pi-dev am: a0cb928098
...
am: cc611845bf
Change-Id: I1ec1459dd06065228957991ce4a04954dcd3c1dd
2018-03-16 16:41:52 +00:00
Alison Cichowlas
b9ef0adf66
Merge "Sort Uncategorized channel to the bottom." into pi-dev am: 97f63ba910
...
am: 3aaf3bcc52
Change-Id: Ibd106a3ce049eb90263f69878088b91e3e8dc359
2018-03-16 16:23:48 +00:00
Chad Brubaker
dbc524b904
Fix lockdown string
...
Change-Id: Iefae9a2fb00f1bdd8b9cce1b0c018df729aa1141
Fixes: 75001345
Test: new string is displayed
2018-03-16 09:21:09 -07:00
Julia Reynolds
cc611845bf
Merge "Fix channel screen launching" into pi-dev
...
am: a0cb928098
Change-Id: I752695e576eae29650c3d79841b509fb267429b6
2018-03-16 16:18:23 +00:00
Jan Nordqvist
b65b3ce173
In Data Usage screen, Above the data bar, Change font size of number.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I671a605fe341f36adeb6ae239333295ddfb550c7
2018-03-16 09:16:26 -07:00
Alison Cichowlas
3aaf3bcc52
Merge "Sort Uncategorized channel to the bottom." into pi-dev
...
am: 97f63ba910
Change-Id: I4e272ef729124c926a2de3510985556e5375bfa5
2018-03-16 16:02:23 +00:00
Julia Reynolds
a0cb928098
Merge "Fix channel screen launching" into pi-dev
2018-03-16 15:45:05 +00:00
Alison Cichowlas
97f63ba910
Merge "Sort Uncategorized channel to the bottom." into pi-dev
2018-03-16 15:44:12 +00:00
Adam Newman
e827f1528c
Merge "Enable launching captive portal directly" into pi-dev am: 2483a40841
...
am: 4b8efabd20
Change-Id: I74f3634e25dfe0e6f20ff6441f412bc272cd72fe
2018-03-16 14:55:08 +00:00
Adam Newman
4b8efabd20
Merge "Enable launching captive portal directly" into pi-dev
...
am: 2483a40841
Change-Id: I6ee69efe346eff3c391dc9251b9881b23d85042b
2018-03-16 14:42:19 +00:00
Adam Newman
2483a40841
Merge "Enable launching captive portal directly" into pi-dev
2018-03-16 14:26:25 +00:00
Alan Viverette
f431cb5c3c
Restore "Update for 1.0.0-beta1" am: 4734b3448a
...
am: bba48f3184
Change-Id: I3f94b2e1d914a9fedb087b348bea537783a51637
2018-03-16 14:21:51 +00:00
Alan Viverette
bba48f3184
Restore "Update for 1.0.0-beta1"
...
am: 4734b3448a
Change-Id: I18ef49f6ed15a3e01b8fda0ab4954f356982facd
2018-03-16 14:06:33 +00:00
Alan Viverette
4734b3448a
Restore "Update for 1.0.0-beta1"
...
This reverts commit b4fe52343c
.
Bug: 74950017
Test: manual
Change-Id: I9749b9ae8f2f75b1bbdf7c6686a036db1f6f8a74
2018-03-16 02:13:11 +00:00
Lei Yu
206f406aeb
update strings in battery settings(Round 1)
...
This cl updates the strings in several battery
settings pages and dialogs, also add footers
for battery manager page and restrict app page.
Update the strings in battery settings except:
1. Summary for smart battery toggle
2. "Full charge lasts"
3. Restrict dialog
4. App info page
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I4955cc7c19b5f1df18f21cfb47e8859c997e19d1
2018-03-15 17:23:59 -07:00
Jerry Zhang
55d10dff53
Update USB settings screen
...
Screen now handles data role and power
role switching as separate categories.
Change the UsbBackend api to use predefined
constants. Split out data and power direction
changes into separate functions.
Add tests for new controllers and new backend
functionality.
Bug: 72829348
Test: passes
Change-Id: I28b96cf49463fa4f3a4b6be41c57d5841731fbd6
2018-03-15 17:18:41 -07:00
Alison Cichowlas
83ca82f749
Sort Uncategorized channel to the bottom.
...
Bug: 64803214
Test: manual, with Duo app
Change-Id: I8e39fbed4ecda2efebb4606f38ea934647317207
2018-03-15 18:11:18 -04:00
Adam Newman
c6b4f3d92c
Enable launching captive portal directly
...
Whenever a user has connected to a captive portal network, split the
ConnectedAccessPointPreference to allow directly signing into the
captive portal or modifying the network's settings. When in any other
network state, use the old behavior of a single tappable preference that
takes the user to settings.
Bug: 63929546
Bug: 68031656
Test: make RunSettingsRoboTests
Test: manual by connecting to Captive Portal and normal WiFi networks.
Change-Id: I444202a12138d90c94bda94945c121c8c0810536
(cherry picked from commit 7577624db7
)
2018-03-15 21:05:25 +00:00
Alan Viverette
0dd5923ec1
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev am: 767743d64d
...
am: 5853856ead
Change-Id: I7615fbcdaf6f77385e487fd92cf51dd3a10ed9ad
2018-03-15 21:03:03 +00:00
Alan Viverette
5853856ead
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
...
am: 767743d64d
Change-Id: Ifd2438bfa6947bd98eb4d0a843a689d7790cc6ed
2018-03-15 20:38:29 +00:00
Adam Newman
2e48b1b477
Merge "Enable launching captive portal directly"
2018-03-15 20:37:22 +00:00
Alan Viverette
767743d64d
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
2018-03-15 20:04:22 +00:00
Lei Yu
ee0e5af8d0
Merge "Update strings for location" into pi-dev am: 4aff464a39
...
am: e139ef5552
Change-Id: I3870629a47447f4ee658604ad4a840303baaeafc
2018-03-15 19:37:27 +00:00
Lei Yu
d22e330de0
Merge "Update the restrict app list" into pi-dev am: 992444b726
...
am: a5a288f873
Change-Id: Iac997edfb8d3bce2be4a53a38c29c88b06fed55b
2018-03-15 19:23:19 +00:00
Neil Fuller
42123c413e
Merge "Track changes in libcore" into pi-dev am: ea2ef1af44
...
am: 082dd24a7e
Change-Id: Id30429da4c06994f92bab507bc2e80ca6040f10c
2018-03-15 19:09:56 +00:00
Lei Yu
33f3c7036b
Merge "Add dialog when restrict apps are more than 5" into pi-dev am: 34bfe74249
...
am: 137be5de5b
Change-Id: I83fabfcfb62c53b9cd54be285aa1e165f7047122
2018-03-15 19:09:23 +00:00
Lei Yu
e139ef5552
Merge "Update strings for location" into pi-dev
...
am: 4aff464a39
Change-Id: Id638dfc191818a64f669d197395801fb0794aabd
2018-03-15 18:53:37 +00:00
Alan Viverette
b4fe52343c
Revert "Update for 1.0.0-beta1"
...
This reverts commit 6b1fd5cfa9
.
Reason for revert: broke Settings
Bug: 74950017
Test: revert only
Change-Id: If56a4dcac4671d8e2c5f2c0de30d13e3cf58666a
2018-03-15 18:48:00 +00:00
Lei Yu
a5a288f873
Merge "Update the restrict app list" into pi-dev
...
am: 992444b726
Change-Id: Iefa2af2ed0ede08e484c3ecd02b221d4e8c0c5c3
2018-03-15 18:39:37 +00:00
Neil Fuller
082dd24a7e
Merge "Track changes in libcore" into pi-dev
...
am: ea2ef1af44
Change-Id: I9e743ab65f9accccb848b2df99c58f6b636ad604
2018-03-15 18:36:50 +00:00
Lei Yu
137be5de5b
Merge "Add dialog when restrict apps are more than 5" into pi-dev
...
am: 34bfe74249
Change-Id: I5ba41a7343c8c274c785429322fe2b1ed4c6aa81
2018-03-15 18:33:42 +00:00
TreeHugger Robot
4aff464a39
Merge "Update strings for location" into pi-dev
2018-03-15 18:30:24 +00:00
Lei Yu
992444b726
Merge "Update the restrict app list" into pi-dev
2018-03-15 18:28:48 +00:00
Neil Fuller
ea2ef1af44
Merge "Track changes in libcore" into pi-dev
2018-03-15 18:26:36 +00:00
Qingxi Li
e0681db921
UI Tweak for eSIM related
...
This CL update following UI of eSIM:
1. update title of eSIM reset checkbox under network reset and FDR screens.
2. update eSIM reset checkbox to default is checked.
3. Show eSIM reset checkbox in FDR when user is under developer mode.
Bug: 74083169
Bug: 74085673
Bug: 74771900
Bug: 74122440
Test: E2E & make RunSettingsRoboTests
Change-Id: Ia49fdae98d6ef541398b1dfb36c54beea1f2ba39
2018-03-15 11:24:25 -07:00
Lei Yu
34bfe74249
Merge "Add dialog when restrict apps are more than 5" into pi-dev
2018-03-15 18:01:58 +00:00
Sundeep Ghuman
f2b1c96a58
Merge "Change text for data warning and data limit." into pi-dev am: b673aaadc9
...
am: b4c8282929
Change-Id: I62afb3eae9de961145cf2e8c356d1fc1fb27494f
2018-03-15 17:40:10 +00:00
Lei Yu
2c4dd8831d
Merge "Update string in battery app info page" into pi-dev am: e5c7317f3f
...
am: adb61e0828
Change-Id: If2abd04bd55e73e2f9123357333f4be234a893be
2018-03-15 17:31:21 +00:00
Sundeep Ghuman
b4c8282929
Merge "Change text for data warning and data limit." into pi-dev
...
am: b673aaadc9
Change-Id: Icf0d3cc17abe30946543af85829f9223fc89d921
2018-03-15 17:18:15 +00:00
Lei Yu
adb61e0828
Merge "Update string in battery app info page" into pi-dev
...
am: e5c7317f3f
Change-Id: Ib4ee8e6d0a2470e995dfd9c7d577759cb146ec58
2018-03-15 17:17:25 +00:00
Lei Yu
99da04933d
Update the wifi off string
...
When wifi scanning is on.
Bug: 65626601
Test: Manual
Change-Id: Ib4b6ee1cc7f2cc1d8d4ab4d7500579047fd1bfd6
2018-03-15 10:09:57 -07:00