Commit Graph

14099 Commits

Author SHA1 Message Date
Jan Nordqvist
085b9e6f83 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
am: 9e1226e431

Change-Id: I5fd67fc34ed244178b6c6a9919761ceaa6087239
2018-03-19 19:06:11 +00:00
Jan Nordqvist
9e1226e431 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev 2018-03-19 18:05:44 +00:00
TreeHugger Robot
8aff2f8fe7 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-19 17:07:14 +00:00
Andreas Terzis
e5468d5ce0 Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
am: 895f785470

Change-Id: Ib3f59b7c930f909e80e2f61dd4c3f54ffda5821a
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
Bill Yi
5b57d1d1cb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6421ebc38133f014551740dd9974dbb687a13b2d
2018-03-19 07:17:36 -07:00
Julia Reynolds
37f00d489a Merge "Add placeholder on DND settings screen" into pi-dev
am: b0f251597c

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

Change-Id: I2eeb0b2e585fd958be20f5831bee4257b1838c92
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
559377618b Merge "Update the wifi off string" into pi-dev
am: ef0278ae3c

Change-Id: I5e01bef3499120ad709834cff1afa4f4dc956dc6
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
Jan Nordqvist
b104a25dd0 In Data Usage screen, Above the data bar, Change font size of number.
This is related to ag/3746508 and sets the size of the "small" text to 16sp.

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I17f859186dc596c4dbab190241325bac4dad5554
2018-03-16 14:26:18 -07: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

Change-Id: I9c70fdc2b327e095a75edc0bd6720e671e8f1436
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
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
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
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
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
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
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
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
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
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
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
Julia Reynolds
9aac3ce9ed Add placeholder on DND settings screen
Bug: 74321426
Test: make -j20 RunSettingsRoboTests
Change-Id: Icb7d21e342af85d1ad83e89efa2fe9a1d41e710b
2018-03-15 09:34:03 -04: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
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
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