Lei Yu
f687bc9b99
Merge "Update string for battery seekbar" into pi-dev am: 8916df573d
...
am: b5d38cc5f9
Change-Id: I4d631531c96e1afca80edca0779a02a5aa3e20fe
2018-03-20 08:32:40 +00:00
Sunny Goyal
e89345ac20
Merge "Fixing settings crash when no default home app is set" into pi-dev am: ee2ac81999
...
am: 472037fdd3
Change-Id: I529c019f5109297f5ec3064128367d3c66ac931e
2018-03-20 08:31:14 +00:00
hughchen
7fc5f884db
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev am: 138bdf6030
...
am: 5cf0b2843e
Change-Id: I7529e6fdc451816ab29ede90f433086081a61b24
2018-03-20 08:28:14 +00:00
Maurice Lam
52512f64ee
Merge "Make "minimal" pattern layout sw320dp" into pi-dev am: b98eea4c67
...
am: f7c9fbea5e
Change-Id: Ic0991d908971f8dc62f0f21c8d5e509c95de3ff0
2018-03-20 08:07:54 +00:00
Lei Yu
ccba53cb0b
Merge "update "Last full charge" preference" into pi-dev am: de0a3a5334
...
am: 549d4bd297
Change-Id: Ie2a55082d3a7916b5eec4499518f2675c92afce2
2018-03-20 07:44:49 +00:00
Hall Liu
e3b9578658
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev am: 8837f992bb
...
am: 0738a917df
Change-Id: I5ee44871c48d6052b1d62f4cbd8dd1ed76bd74e6
2018-03-20 07:12:38 +00:00
Lei Yu
306f7312f4
Merge "Update the mechanism to upload new anomaly config" into pi-dev am: d06991821f
...
am: f31a7c546d
Change-Id: I6e6f5492a7fafedd74e88a51ef977ccab1e78f5d
2018-03-20 05:58:53 +00:00
TreeHugger Robot
8916df573d
Merge "Update string for battery seekbar" into pi-dev
2018-03-20 04:32:51 +00:00
TreeHugger Robot
ee2ac81999
Merge "Fixing settings crash when no default home app is set" into pi-dev
2018-03-20 04:32:10 +00:00
TreeHugger Robot
138bdf6030
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
2018-03-20 04:09:27 +00:00
TreeHugger Robot
b98eea4c67
Merge "Make "minimal" pattern layout sw320dp" into pi-dev
2018-03-20 03:30:42 +00:00
Lei Yu
b3113bf861
Update string for battery seekbar
...
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I7661fb8d324ae5df468e03d2940a48e03952e3cb
2018-03-19 19:23:29 -07:00
Sunny Goyal
617acf352b
Fixing settings crash when no default home app is set
...
Test: make -j20 RunSettingsRoboTests
Bug: 74519090
Change-Id: I8846bae1f0083be981cfde9a68291c1b01359228
2018-03-20 02:08:14 +00:00
hughchen
18ce28ed33
Change BatteryUtils.isLegacyApp() to isPreOApp()
...
Bug: 73792442
Test: RunSettingsRoboTests
make -j40 RunSettingsRoboTests
Change-Id: I770030a8f38ec6156aa2a40f4c88ac9e0673751d
2018-03-20 01:44:43 +00:00
Lei Yu
de0a3a5334
Merge "update "Last full charge" preference" into pi-dev
2018-03-20 00:33:29 +00:00
Hall Liu
8837f992bb
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
2018-03-19 21:15:26 +00:00
Lei Yu
d06991821f
Merge "Update the mechanism to upload new anomaly config" into pi-dev
2018-03-19 20:20:15 +00:00
Lei Yu
8b148924de
update "Last full charge" preference
...
When there is average time estimation, change it to "Full charge lasts
about" and also update the time.
Also update the BatteryInfo to return average time estimation even
though it is charging.
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib22dadb5716e3034c60aeeb7768fdbf0cc86be0c
2018-03-19 13:18:27 -07:00
Jong Wook Kim
056aea7eff
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev am: 8a022d8693
...
am: 3520bfc36d
Change-Id: I153088f7ee8f7284b9c8b3122e449b24bf71a96f
2018-03-19 19:39:22 +00:00
Maurice Lam
b0e88dbbfe
Make "minimal" pattern layout sw320dp
...
The minimal layout was sw400dp, but some smaller phones still have
enough space to display the icon and button decently, so we're
reducing the trigger threshold for the "minimal" layout to sw320dp.
Test: m -j RunSettingsRoboTests
Bug: 74527018
Change-Id: Ibfca1828870058301cca302554ce3d932c8ba70b
2018-03-19 18:27:18 +00:00
Jong Wook Kim
8a022d8693
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
2018-03-19 18:14:08 +00:00
Jan Nordqvist
6e6c8bee6e
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev am: 44e5941757
...
am: e220966de1
Change-Id: I5caaab55a05d16bd709861c3d269e7712b32e96b
2018-03-19 16:29:30 +00:00
Jan Nordqvist
44e5941757
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
2018-03-19 16:04:23 +00:00
Andreas Terzis
4bad644838
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev am: 895f785470
...
am: e5468d5ce0
Change-Id: I65f4fb7036ed81f26022ebb18e342ba278b5d7a9
2018-03-19 14:42:12 +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
Jong Wook Kim
091894d09d
Display "MAC address is randomized" in Wifi Preference Page
...
When Connected MAC Randomization is enabled and the device is
disconnected, there isn't a valid MAC address to display since we don't
know what the device's next MAC address is going to be.
Instead of displaying the MAC address used for previous connection, tell
users that "MAC address is randomized."
Bug: 73663275
Test: make -j40 RunSettingsRoboTests
Change-Id: Id5352926f221e3215734d1c198f2072940f82695
2018-03-18 21:55:09 +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
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
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
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
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
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
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
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
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
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
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
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
d22e330de0
Merge "Update the restrict app list" into pi-dev am: 992444b726
...
am: a5a288f873
Change-Id: Iac997edfb8d3bce2be4a53a38c29c88b06fed55b
2018-03-15 19:23:19 +00:00
Neil Fuller
42123c413e
Merge "Track changes in libcore" into pi-dev am: ea2ef1af44
...
am: 082dd24a7e
Change-Id: Id30429da4c06994f92bab507bc2e80ca6040f10c
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
Change-Id: I83fabfcfb62c53b9cd54be285aa1e165f7047122
2018-03-15 19:09:23 +00:00
Alan Viverette
b4fe52343c
Revert "Update for 1.0.0-beta1"
...
This reverts commit 6b1fd5cfa9
.
Reason for revert: broke Settings
Bug: 74950017
Test: revert only
Change-Id: If56a4dcac4671d8e2c5f2c0de30d13e3cf58666a
2018-03-15 18:48:00 +00:00