Andreas Terzis
f0ab2102e8
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev am: 91ea3c5e56
...
am: b32915a9a7
2018-03-20 08:34:15 +00:00
Lei Yu
cbbe4a337f
Merge "Add summary for battery manager preference" into pi-dev am: 06d5188a71
...
am: fca54d8788
2018-03-20 08:33:21 +00:00
Lei Yu
f687bc9b99
Merge "Update string for battery seekbar" into pi-dev am: 8916df573d
...
am: b5d38cc5f9
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
2018-03-20 08:31:14 +00:00
hughchen
7fc5f884db
Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev am: 138bdf6030
...
am: 5cf0b2843e
2018-03-20 08:28:14 +00:00
Maurice Lam
52512f64ee
Merge "Make "minimal" pattern layout sw320dp" into pi-dev am: b98eea4c67
...
am: f7c9fbea5e
2018-03-20 08:07:54 +00:00
Fan Zhang
c83966663e
Merge "Update switch bar summary for spell checker page" into pi-dev am: 39b54ea1f8
...
am: e147c48470
2018-03-20 08:06:26 +00:00
jdesprez
57b9e15574
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am: a2da6221c0
...
am: 42e58da882
2018-03-20 07:55:16 +00:00
Lei Yu
ccba53cb0b
Merge "update "Last full charge" preference" into pi-dev am: de0a3a5334
...
am: 549d4bd297
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
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
2018-03-20 05:58:53 +00:00
Andreas Terzis
91ea3c5e56
Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
2018-03-20 05:49:51 +00:00
TreeHugger Robot
06d5188a71
Merge "Add summary for battery manager preference" into pi-dev
2018-03-20 04:36:48 +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
TreeHugger Robot
39b54ea1f8
Merge "Update switch bar summary for spell checker page" into pi-dev
2018-03-20 02:58:38 +00:00
Lei Yu
6c16840ff5
Add summary for battery manager preference
...
Show different summary based on whether it is on and there is restricted
apps.
Also move method to get restricted app list to BatteryTipUtils since it
is used in 2 places.
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib2306e0fd1f520fde6d1403ce9c527c241d36005
2018-03-19 19:27:36 -07:00
Lei Yu
b3113bf861
Update string for battery seekbar
...
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I7661fb8d324ae5df468e03d2940a48e03952e3cb
2018-03-19 19:23:29 -07:00
TreeHugger Robot
a2da6221c0
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
2018-03-20 02:13:47 +00: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
Fan Zhang
1a77cfc8fe
Update switch bar summary for spell checker page
...
Change-Id: If48ad81e5ad5e4a7bd65ede5ed67d28250fbe8ed
Fixes: 75277295
Test: atest SpellCheckerSettingsUITest
2018-03-19 18:05:10 -07:00
Lei Yu
de0a3a5334
Merge "update "Last full charge" preference" into pi-dev
2018-03-20 00:33:29 +00:00
jdesprez
881004ca26
Update AndroidTest.xml to be APCT suite ready
...
Test: atest SettingsUITests
Bug: 74440293
Change-Id: Id7940589a5cd216668ab4664bb802faaf70b5f68
2018-03-19 14:46:45 -07:00
Hall Liu
8837f992bb
Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
2018-03-19 21:15:26 +00:00
Jan Nordqvist
641288f7c1
In Data Usage screen, hide data bar if plan is unlimited
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e
2018-03-19 14:13:47 -07: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
Lei Yu
cd38d0e16a
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev am: dcf7b68920
...
am: 7f14fa4f7d
2018-03-19 20:06:31 +00:00
Jong Wook Kim
056aea7eff
Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev am: 8a022d8693
...
am: 3520bfc36d
2018-03-19 19:39:22 +00:00
Lei Yu
dcf7b68920
Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
2018-03-19 18:45:08 +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
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
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
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
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
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
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
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
