Jan Nordqvist
6e6c8bee6e
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev am: 44e5941757
...
am: e220966de1
2018-03-19 16:29:30 +00:00
Jan Nordqvist
e220966de1
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
...
am: 44e5941757
2018-03-19 16:15:50 +00:00
Jan Nordqvist
44e5941757
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
2018-03-19 16:04:23 +00:00
Andreas Terzis
4bad644838
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev am: 895f785470
...
am: e5468d5ce0
2018-03-19 14:42:12 +00:00
Andreas Terzis
e5468d5ce0
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
...
am: 895f785470
2018-03-19 14:30:08 +00:00
Andreas Terzis
895f785470
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
2018-03-19 14:22:51 +00:00
Julia Reynolds
fefa6653b4
Merge "Add placeholder on DND settings screen" into pi-dev am: b0f251597c
...
am: 37f00d489a
2018-03-17 14:58:00 +00:00
Julia Reynolds
37f00d489a
Merge "Add placeholder on DND settings screen" into pi-dev
...
am: b0f251597c
2018-03-17 14:35:15 +00:00
Julia Reynolds
b0f251597c
Merge "Add placeholder on DND settings screen" into pi-dev
2018-03-17 14:28:41 +00:00
Bill Yi
54f6b59e20
Merge "Import translations. DO NOT MERGE" into pi-dev am: 77d1ca7030 -s ours
...
am: 152a850c30
2018-03-17 00:43:38 +00:00
Bill Yi
152a850c30
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 77d1ca7030
2018-03-16 23:59:16 +00:00
Jan Nordqvist
c7faabf408
Add the string "No time remaining" when remaining time <= 0.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id8ff1dde78f3389b5ab15120a2460ab19e895c6f
2018-03-16 16:32:00 -07:00
Jerry Zhang
191e31fec9
Merge "Update USB settings screen" into pi-dev am: d85ef28585
...
am: 00bf936304
2018-03-16 23:25:10 +00:00
TreeHugger Robot
77d1ca7030
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-16 23:19:48 +00:00
Jerry Zhang
00bf936304
Merge "Update USB settings screen" into pi-dev
...
am: d85ef28585
2018-03-16 23:12:29 +00:00
Jerry Zhang
d85ef28585
Merge "Update USB settings screen" into pi-dev
2018-03-16 22:40:38 +00:00
Lei Yu
07736734ff
Merge "Update the wifi off string" into pi-dev am: ef0278ae3c
...
am: 559377618b
2018-03-16 22:12:08 +00:00
Lei Yu
559377618b
Merge "Update the wifi off string" into pi-dev
...
am: ef0278ae3c
2018-03-16 21:47:03 +00:00
Jan Nordqvist
637dc29fe9
In Network & internet screen, hide summary under Data usage when there is No SIM
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4abd401aa9420b2b0090fac76991fe5067acc2e9
2018-03-16 14:29:33 -07:00
Lei Yu
ef0278ae3c
Merge "Update the wifi off string" into pi-dev
2018-03-16 21:28:43 +00:00
Julia Reynolds
f36efcdfd6
Merge "Link to dnd settings from notification settings" into pi-dev am: 5d419a2dcf
...
am: c34fe741d1
2018-03-16 20:32:40 +00:00
Bill Yi
dbc03e5b02
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If94e8adc7ea1d0106ebb553314d47f4311ffbd0e
2018-03-16 13:20:09 -07:00
Julia Reynolds
c34fe741d1
Merge "Link to dnd settings from notification settings" into pi-dev
...
am: 5d419a2dcf
2018-03-16 20:00:44 +00:00
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
2018-03-16 19:13:22 +00:00
Lei Yu
dd4a47f940
Merge "update strings in battery settings(Round 1)" into pi-dev
...
am: cf0cae785f
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
Jan Nordqvist
87501f8165
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev am: 6b65ffaab7
...
am: b1d3e89372
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
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
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
2018-03-16 16:23:48 +00:00
Julia Reynolds
cc611845bf
Merge "Fix channel screen launching" into pi-dev
...
am: a0cb928098
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
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
2018-03-16 14:55:08 +00:00
Adam Newman
4b8efabd20
Merge "Enable launching captive portal directly" into pi-dev
...
am: 2483a40841
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
2018-03-16 14:21:51 +00:00
Alan Viverette
bba48f3184
Restore "Update for 1.0.0-beta1"
...
am: 4734b3448a
2018-03-16 14:06:33 +00:00
Alan Viverette
4734b3448a
Restore "Update for 1.0.0-beta1"
...
This reverts commit b4fe52343c
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
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
2018-03-15 21:03:03 +00:00
Alan Viverette
5853856ead
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
...
am: 767743d64d
2018-03-15 20:38:29 +00:00
