Julia Reynolds
b0f251597c
Merge "Add placeholder on DND settings screen" into pi-dev
2018-03-17 14:28:41 +00:00
Lei Yu
301a89d726
Remove dupe key in UniquePreferenceTest
...
The duplicate page already removed in b/70848054, we need to update
the test.
Change-Id: Ia1f313d211e7528311e56596dbab152aad54bf22
Fixes: 70848054
Test: runtest -x UniquePreferenceTest
2018-03-16 18:19:17 -07:00
Bill Yi
54f6b59e20
Merge "Import translations. DO NOT MERGE" into pi-dev am: 77d1ca7030
-s ours
...
am: 152a850c30
-s ours
Change-Id: Ifafa4d69eabfa4e38faf768d6e9051dc1d0baa90
2018-03-17 00:43:38 +00:00
Bill Yi
152a850c30
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 77d1ca7030
-s ours
Change-Id: I28549cd7cc5ee5a38037a63a10c5351e899589a6
2018-03-16 23:59:16 +00:00
Phil Weaver
e530e2634d
Update string for dwell click timing
...
Also adding a footer to the preference.
Change-Id: If34cf34ecec29918a1def0c924f4fe1dc378918c
Fixes: 71869029
Test: Make, navigate and observe glorious new string
2018-03-16 16:34:22 -07: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
Change-Id: Ic6359ec20c413812d0492497a2c8b07a00b95f03
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
Change-Id: I2eeb0b2e585fd958be20f5831bee4257b1838c92
2018-03-16 23:12:29 +00:00
Hall Liu
6f4b185331
Split "Mobile Network Type" indication in Settings
...
Display data and voice network type for clarity
Change-Id: I26e52dcc564dfd96e36e45d94d6e69225ea4a80f
Fixes: 70938010
Test: manual, unit
2018-03-16 22:53:12 +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
Change-Id: I5be477d03841c4d44efce0208e2f65508481a61e
2018-03-16 22:12:08 +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
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
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
Julia Reynolds
f36efcdfd6
Merge "Link to dnd settings from notification settings" into pi-dev am: 5d419a2dcf
...
am: c34fe741d1
Change-Id: I6b63ce4c08a648745f471fc6e39f0d79469e0cc1
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
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
0bd76013f2
Merge "update strings in battery settings(Round 1)" into pi-dev am: cf0cae785f
...
am: dd4a47f940
Change-Id: I4b733b279865ece8c64b0536a8ae6000a6d98752
2018-03-16 19:13:22 +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
2b6e422ca1
Add log for battery tip action.
...
For each action, we add log when it is triggered.
RestrictAppAction could be triggered in multiple locations
(main page vs battery app detail page), so we add metricsKey to
distinguish them
Bug: 73888115
Test: RunSettingsRoboTests
Change-Id: I08f28431c4e891bf90816ce91f551edc671579cd
2018-03-16 11:37:30 -07:00
Lei Yu
cf0cae785f
Merge "update strings in battery settings(Round 1)" into pi-dev
2018-03-16 18:26:49 +00:00
Lei Yu
9a80d6ebb8
Update the mechanism to upload new anomaly config
...
1. Move the config update to jobscheduler, so config is checked and
updated every day.
2. Before the update, always delete the old config.
3. Move uploadIntent method to BatteryTipUtils.
Bug: 74997752
Fixes: 74564143
Test: RunSettingsRoboTests
Change-Id: If88759595d57a562b25542082f895fe8f207acdb
2018-03-16 11:24:14 -07: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
Change-Id: I6c4045aed589dc4f11a70cb8c4475357052ce12b
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
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
Julia Reynolds
bbcc221a87
Merge "Fix channel screen launching" into pi-dev am: a0cb928098
...
am: cc611845bf
Change-Id: I1ec1459dd06065228957991ce4a04954dcd3c1dd
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
Change-Id: Ibd106a3ce049eb90263f69878088b91e3e8dc359
2018-03-16 16:23:48 +00:00
Chad Brubaker
dbc524b904
Fix lockdown string
...
Change-Id: Iefae9a2fb00f1bdd8b9cce1b0c018df729aa1141
Fixes: 75001345
Test: new string is displayed
2018-03-16 09:21:09 -07:00
Julia Reynolds
cc611845bf
Merge "Fix channel screen launching" into pi-dev
...
am: a0cb928098
Change-Id: I752695e576eae29650c3d79841b509fb267429b6
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
Change-Id: I4e272ef729124c926a2de3510985556e5375bfa5
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
Change-Id: I74f3634e25dfe0e6f20ff6441f412bc272cd72fe
2018-03-16 14:55:08 +00: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
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
Change-Id: I3f94b2e1d914a9fedb087b348bea537783a51637
2018-03-16 14:21:51 +00:00
Alan Viverette
bba48f3184
Restore "Update for 1.0.0-beta1"
...
am: 4734b3448a
Change-Id: I18ef49f6ed15a3e01b8fda0ab4954f356982facd
2018-03-16 14:06:33 +00:00
Alan Viverette
4734b3448a
Restore "Update for 1.0.0-beta1"
...
This reverts commit b4fe52343c
.
Bug: 74950017
Test: manual
Change-Id: I9749b9ae8f2f75b1bbdf7c6686a036db1f6f8a74
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
Test: passes
Change-Id: I28b96cf49463fa4f3a4b6be41c57d5841731fbd6
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
Change-Id: I7615fbcdaf6f77385e487fd92cf51dd3a10ed9ad
2018-03-15 21:03:03 +00:00
Alan Viverette
5853856ead
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
...
am: 767743d64d
Change-Id: Ifd2438bfa6947bd98eb4d0a843a689d7790cc6ed
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