Julia Reynolds
cc611845bf
Merge "Fix channel screen launching" into pi-dev
...
am: a0cb928098
2018-03-16 16:18:23 +00: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
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
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
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
5853856ead
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
...
am: 767743d64d
2018-03-15 20:38:29 +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
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
Sundeep Ghuman
b4c8282929
Merge "Change text for data warning and data limit." into pi-dev
...
am: b673aaadc9
2018-03-15 17:18:15 +00:00
Lei Yu
adb61e0828
Merge "Update string in battery app info page" into pi-dev
...
am: e5c7317f3f
2018-03-15 17:17:25 +00:00
Sundeep Ghuman
b673aaadc9
Merge "Change text for data warning and data limit." into pi-dev
2018-03-15 17:08:34 +00:00
Lei Yu
e5c7317f3f
Merge "Update string in battery app info page" into pi-dev
2018-03-15 17:06:00 +00:00
Jan Nordqvist
7b352d271e
Change text for data warning and data limit.
...
This change modifies the "data warning" text to show either nothing, only
warning, only limit, or warning and limit, based on which of the values are
set. It also remove the capitalization of the first letter of the texts.
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ifebb411b906719c6e2f343f48d825f7b6f17af53
2018-03-15 09:49:32 -07:00
Brad Ebinger
cfa9346d12
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
...
am: ab988900c4
2018-03-15 16:19:32 +00:00
Suresh Koleti
c565ddff96
Donot disable Wi-Fi Calling when getting "registration error" intent.
...
am: 87e0d43237
2018-03-15 16:18:49 +00:00
Brad Ebinger
ab988900c4
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
2018-03-15 16:04:56 +00:00
Sundeep Ghuman
3efee3606d
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
...
am: 437d421eaf
2018-03-15 15:54:16 +00:00
Sundeep Ghuman
437d421eaf
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
...
* changes:
Set color of update line to red if update is older than six hours.
In Data Usage screen, Below the data bar, Add “X days left” field.
In Data Usage screen, add over-limit state.
Change text layout of data usage string.
2018-03-15 15:43:17 +00:00
Alan Viverette
f5bbe75951
Merge "Update for 1.0.0-beta1" into pi-dev
...
am: 3618f68c01
2018-03-15 13:59:45 +00:00
Alan Viverette
3618f68c01
Merge "Update for 1.0.0-beta1" into pi-dev
2018-03-15 13:32:16 +00:00
Julia Reynolds
ee5870bac6
Fix channel screen launching
...
Test: launch channel screen from Settings & external app
Change-Id: Ib9add2f25cbacde192095407b83b17438946a493
Fixes: 73814186
2018-03-15 08:37:59 -04:00
Jan Nordqvist
9a65e5fec7
Set color of update line to red if update is older than six hours.
...
In Data Usage screen, out-of-date state
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Icf6fafe9ab61a2c1ac3fba2bebf3bd4407c0ecfe
2018-03-15 00:20:39 -07:00
Jan Nordqvist
a6f6e9c41c
In Data Usage screen, Below the data bar, Add “X days left” field.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I35eb3f0c09c84d609ad54e87400913ec77e19ea0
2018-03-15 00:17:53 -07:00
Sundeep Ghuman
21ef6cb644
In Data Usage screen, add over-limit state.
...
Bug: 70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: Ieec0c486c6a5451cd5983f02e202ddac3413a602
2018-03-14 23:22:30 -07:00
Jan Nordqvist
8a241f642e
Change text layout of data usage string.
...
In Data Usage screen, Above the data bar, Change font size of number
In Data Usage screen, Above the data bar, Update text style of “GB used”
In Data Usage screen, Above the data bar, Add “GB left” aligned right of bar (not always shown)
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I8accb16425283cf148ddb6b6646f92ff51a74b7c
2018-03-14 22:48:46 -07:00
Andrew Sapperstein
ce11c1b5e2
Merge "update the whitelist for anomaly detection" into pi-dev
...
am: eb029cffaf
2018-03-15 05:16:29 +00:00
Andrew Sapperstein
eb029cffaf
Merge "update the whitelist for anomaly detection" into pi-dev
2018-03-15 05:09:59 +00:00
Sundeep Ghuman
dfaa287e43
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
...
am: d610e51613
2018-03-15 05:09:41 +00:00
Andrew Sapperstein
56fa9159fb
Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev
...
am: 0f6ff091b4
2018-03-15 05:08:47 +00:00
Sundeep Ghuman
d610e51613
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
2018-03-15 05:00:41 +00:00
Andrew Sapperstein
0f6ff091b4
Merge "Rename “Mobile data usage” to “App data usage” & hide summary" into pi-dev
2018-03-15 04:58:42 +00:00
Lei Yu
8d1e9fe6d6
Update string in battery app info page
...
Change-Id: I78ce7499f10bb65d44865349738bf77300180867
Fixes: 73576591
Bugs: 73018395
Test: Manual
2018-03-14 17:02:30 -07:00
Sundeep Ghuman
ea8d866337
Fix the ProgressBar in DataUsageSummaryV2 page.
...
Bug: 70950124
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I83f268c0824d9e3520899725fa572753e1de0814
2018-03-14 16:21:46 -07:00
Andreas Terzis
b8642b79c3
Rename “Mobile data usage” to “App data usage” & hide summary
...
In Data usage screen, rename “Mobile data usage” to “App data usage” &
hide summary.
Also, change the title of the new "App data usage" (old "Mobile data
usage") screen to "App data usage".
Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124
Change-Id: Ide9bcb2a4b171edcd088d68275bacda1eb449afe
2018-03-14 11:03:21 -07:00
Yuchen Chang
76fe8d54b1
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
...
am: 4786291624
2018-03-14 17:54:35 +00:00
Lei Yu
888ea9ef1f
Add dialog when restrict apps are more than 5
...
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Iec24fc1ce8e5840207610b3155dffa7059f9aa49
2018-03-14 10:18:20 -07:00
Neil Fuller
6fd477debb
Track changes in libcore
...
Track method parameter changes in libcore.
Bug: 72142943
Test: Build only
Change-Id: I85396aeea98eaa8c093115ee52b52e22d1a4aa2b
2018-03-14 17:11:44 +00:00
