Jerry Zhang
191e31fec9
Merge "Update USB settings screen" into pi-dev am: d85ef28585
...
am: 00bf936304
2018-03-16 23:25:10 +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
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
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
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
2018-03-15 19:37:27 +00:00
Lei Yu
d22e330de0
Merge "Update the restrict app list" into pi-dev am: 992444b726
...
am: a5a288f873
2018-03-15 19:23:19 +00:00
Neil Fuller
42123c413e
Merge "Track changes in libcore" into pi-dev am: ea2ef1af44
...
am: 082dd24a7e
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
2018-03-15 19:09:23 +00:00
Lei Yu
e139ef5552
Merge "Update strings for location" into pi-dev
...
am: 4aff464a39
2018-03-15 18:53:37 +00:00
Alan Viverette
b4fe52343c
Revert "Update for 1.0.0-beta1"
...
This reverts commit 6b1fd5cfa9
2018-03-15 18:48:00 +00:00
Lei Yu
a5a288f873
Merge "Update the restrict app list" into pi-dev
...
am: 992444b726
2018-03-15 18:39:37 +00:00
Neil Fuller
082dd24a7e
Merge "Track changes in libcore" into pi-dev
...
am: ea2ef1af44
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
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
Lei Yu
34bfe74249
Merge "Add dialog when restrict apps are more than 5" into pi-dev
2018-03-15 18:01:58 +00:00
