Commit Graph

14114 Commits

Author SHA1 Message Date
Adam Newman
2e48b1b477 Merge "Enable launching captive portal directly" 2018-03-15 20:37: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
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
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
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
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
Adam Newman
7577624db7 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
2018-03-15 09:50:49 -07: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
Sundeep Ghuman
34aa694717 Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev am: 437d421eaf
am: 3efee3606d

Change-Id: I701d6a4d252b88661cf932ef13c41fc17e5a1000
2018-03-15 16:08:16 +00:00
Sundeep Ghuman
3efee3606d Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
am: 437d421eaf

Change-Id: I346e1868268fa53979886cf4a9c9bb0cebf9af9a
2018-03-15 15:54:16 +00: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
Sundeep Ghuman
7087d24f82 Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev am: d610e51613
am: dfaa287e43

Change-Id: Ide44504a4dc52b67f759343e32e74d501a80dccf
2018-03-15 05:37:10 +00:00
Andrew Sapperstein
275095f282 Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev am: 0f6ff091b4
am: 56fa9159fb

Change-Id: I210be4a55c1f265bfacad04cb766931e7d34405f
2018-03-15 05:24:03 +00:00
Sundeep Ghuman
dfaa287e43 Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
am: d610e51613

Change-Id: I04c04bf38ef388ddd99827407659327222aa7f44
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

Change-Id: Ib5a548c80fb2e0c7afeb0df9e4e1c368ec9be65f
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
Yuchen Chang
f2b0bb1b67 Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev am: 4786291624
am: 76fe8d54b1

Change-Id: I31f8ab52294729f685591d33384b878e34247cd5
2018-03-14 18:29:32 +00: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

Change-Id: I6f3596bb4cde597c9fd72804432aa272504aff0e
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
Yuchen Chang
1bf069f839 Request focus in wifi screen in add network and secure wifi
Request focus from parent view in controller. Based on framework
patch, it can be placed in a parent and focus will go to whatever view
is the default focusable in that hierarchy.

Fixes: 68776177
Fixes: 72882629
Test: RunSettingsRobotests and Manual test
Change-Id: I3bcdc4ec814f68079a00e40435f46bdfa53f4425
2018-03-14 17:18:39 +08:00
Sundeep Ghuman
0e1fdfd472 Merge "Fix new DataUsageSummary page line spacing." into pi-dev am: 9f6ee6e1f8
am: 3791411b62

Change-Id: Idcb170195d6867f0480abf6ba7ac445aee5c2305
2018-03-14 06:15:32 +00:00
jackqdyulei
e99d8c0f09 Merge "Add dialog for summary tip" into pi-dev am: 349c9b2691
am: e107c4394f

Change-Id: Icbd24c8c8d9eb4ab22bfee7c46a9e4c72b7d3466
2018-03-14 06:14:56 +00:00
Sundeep Ghuman
3791411b62 Merge "Fix new DataUsageSummary page line spacing." into pi-dev
am: 9f6ee6e1f8

Change-Id: I0eb675f86c3b3da8d7efd049f311484847e68a6b
2018-03-14 06:06:44 +00:00
Sundeep Ghuman
8d0f26f621 Merge "Add Data warning and limit footer text." into pi-dev am: a41941ce39
am: a543aa03e7

Change-Id: I28977f7c7878b04959f12000a1feaffe2ae761e3
2018-03-14 06:05:31 +00:00
jackqdyulei
e107c4394f Merge "Add dialog for summary tip" into pi-dev
am: 349c9b2691

Change-Id: I189eb9e680baa9d40ae31dab1fc1aa3fae81d00e
2018-03-14 06:00:36 +00:00
TreeHugger Robot
9f6ee6e1f8 Merge "Fix new DataUsageSummary page line spacing." into pi-dev 2018-03-14 06:00:29 +00:00
Sundeep Ghuman
a543aa03e7 Merge "Add Data warning and limit footer text." into pi-dev
am: a41941ce39

Change-Id: I01e218c63c4b3955defdc54ada55903888cce6b9
2018-03-14 05:54:20 +00:00
TreeHugger Robot
349c9b2691 Merge "Add dialog for summary tip" into pi-dev 2018-03-14 05:47:12 +00:00
TreeHugger Robot
a41941ce39 Merge "Add Data warning and limit footer text." into pi-dev 2018-03-14 05:44:44 +00:00
Andreas Terzis
b6756fc770 Merge "Change the color of the measurement numbers below the data bar." into pi-dev am: b687dac159
am: a745277b34

Change-Id: I7dfae909ddc53c54143d1110b3a61bf55fea6495
2018-03-14 05:14:26 +00:00
Andreas Terzis
a745277b34 Merge "Change the color of the measurement numbers below the data bar." into pi-dev
am: b687dac159

Change-Id: I8a90af2a6bfc35de53c5b9e5d9ecd2b582ed6c2d
2018-03-14 04:09:53 +00:00
Andreas Terzis
b687dac159 Merge "Change the color of the measurement numbers below the data bar." into pi-dev 2018-03-14 03:58:32 +00:00
Doris Ling
c149594bfa Merge "Fix alignment for the instant app button." into pi-dev am: 2dd0a66c81
am: 03c8f085e3

Change-Id: I6a9eacc4d21a468ead9698775f71ed204a342d29
2018-03-14 02:07:46 +00:00
Katsiaryna Naliuka
30464e1b8c Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev am: 2ae02f56fb
am: 40dc8a5249

Change-Id: If81076d1b18240a23e1f2f41d3f0cc8b2ac3652c
2018-03-14 01:25:13 +00:00
Doris Ling
03c8f085e3 Merge "Fix alignment for the instant app button." into pi-dev
am: 2dd0a66c81

Change-Id: I0d817a996ee558a3aa6f962ed0c3eccc45ce59eb
2018-03-14 01:10:37 +00:00
Sundeep Ghuman
101c1d09e1 Fix new DataUsageSummary page line spacing.
There are still some unspecified items pending UX. Have left comments on
ag/3702541 to avoid regressions.

Bug: 70950124
Test: UI change only, no code to test.
Change-Id: I7fa96134af750d71786d031652162aed6bffbeb5
2018-03-13 17:56:19 -07:00
Katsiaryna Naliuka
40dc8a5249 Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev
am: 2ae02f56fb

Change-Id: I86f951720246dadd5835dfae8ecbfa3158adc16e
2018-03-14 00:55:10 +00:00