Commit Graph

35782 Commits

Author SHA1 Message Date
Salvador Martinez
126c032afa Add ability to speak to provider for enhanced estimate
Added code that checks if the provider for the enhanced battery
drain estimate is available. If it is available we use that
value instead of the one computed by BatteryStats.

Test: Robotests
Bug: 37753227
Change-Id: I7eae01b56f85d33eafc42ee0f18bb752779581b2
2017-05-04 20:05:53 -07:00
TreeHugger Robot
cdf5fe0d64 Merge "Force refresh language & input fragment title onResume." 2017-05-04 21:58:12 +00:00
TreeHugger Robot
c2e6c82c66 Merge "Add control for the anomaly detection" 2017-05-04 21:32:31 +00:00
Julia Reynolds
5c5830f865 Merge "Only show one copy of each preference" into oc-dev am: 31de48193e
am: c265993528

Change-Id: I705f27b9692671a2a36324e794e098243fa9275b
2017-05-04 20:19:01 +00:00
Julia Reynolds
c265993528 Merge "Only show one copy of each preference" into oc-dev
am: 31de48193e

Change-Id: Ic9b107c57e0db902e8a16c0054f533370c2f819d
2017-05-04 20:15:12 +00:00
Julia Reynolds
31de48193e Merge "Only show one copy of each preference" into oc-dev 2017-05-04 20:08:39 +00:00
TreeHugger Robot
14c62fe39e Merge "Update fingerprint icon color to match the setting theme." 2017-05-04 20:04:50 +00:00
Fan Zhang
17b45add74 Force refresh language & input fragment title onResume.
Fix: 37930106
Test: manual
It's necessary to refresh title because this page user can
change locale from here and fragment won't relaunch. Once
language changes, title must display in the new language.

Change-Id: I5fcaf36fd43e7f4fbbfddf3a77ffbcb9881470e3
2017-05-04 20:04:07 +00:00
Daniel Nishi
31de4c1766 Merge "Fix a bug where override filter was always on." into oc-dev am: 408fd90102
am: 7d50d9db12

Change-Id: Ie9e9b3978e7a2f52fdd63e203a740068188dc285
2017-05-04 17:38:31 +00:00
Esteban Talavera
944030e53f Merge "Show when work profile notifications are blocked for listener" into oc-dev am: 607b4d0573
am: 895796aeb4

Change-Id: I48c4c71458ada35e5158350cddbc4641be8d018b
2017-05-04 17:38:00 +00:00
Daniel Nishi
7d50d9db12 Merge "Fix a bug where override filter was always on." into oc-dev
am: 408fd90102

Change-Id: I800644b0b754b6d2ff844531bfccce47caebfbe1
2017-05-04 17:30:41 +00:00
Esteban Talavera
895796aeb4 Merge "Show when work profile notifications are blocked for listener" into oc-dev
am: 607b4d0573

Change-Id: I7181d474d41c6574eea49f5fc65f06a9b75d2b1e
2017-05-04 17:30:18 +00:00
Daniel Nishi
408fd90102 Merge "Fix a bug where override filter was always on." into oc-dev 2017-05-04 17:18:37 +00:00
Fan Zhang
34bf2b46fc Update fingerprint icon color to match the setting theme.
Change-Id: Ia8a8691cf80d00a4d55dbf925550f7feee3716e6
Fix: 37869891
Test: visual
2017-05-04 17:17:23 +00:00
TreeHugger Robot
607b4d0573 Merge "Show when work profile notifications are blocked for listener" into oc-dev 2017-05-04 17:16:19 +00:00
jackqdyulei
3dbd77e5ae Add control for the anomaly detection
Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: Id71b1324f567e7aa9b51dc25247fff9151d4e108
2017-05-04 10:11:54 -07:00
Lei Yu
5a24c1b84c Merge "Add icon in PowerUsageAnomalyDetails" 2017-05-04 16:56:21 +00:00
Fan Zhang
6db910ab85 Merge "Skip "null" string when building advanced button summary" into oc-dev am: e4eb65c00e
am: d8b6244d82

Change-Id: I0ea1c236ee55c1bb784a39bc8a4990d47616397b
2017-05-04 16:20:46 +00:00
Fan Zhang
d8b6244d82 Merge "Skip "null" string when building advanced button summary" into oc-dev
am: e4eb65c00e

Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
2017-05-04 16:17:46 +00:00
Fan Zhang
e4eb65c00e Merge "Skip "null" string when building advanced button summary" into oc-dev 2017-05-04 16:12:27 +00:00
Julia Reynolds
fc730aa947 Only show one copy of each preference
Fixes: 37912144
Fixes: 37909560
Test: manual, load app settings for legacy and upgrade apps from
inline settings, click (i), and click back.

Change-Id: Ieb96cca03f2596fd44cd33facafa3d4af1fbc24d
2017-05-04 10:10:22 -04:00
Esteban Talavera
2db8240b87 Show when work profile notifications are blocked for listener
Bug: 36657192
Test: m RunSettingsRoboTests

Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit ee349792dd)
2017-05-04 11:41:06 +00:00
Fan Zhang
69104921a9 Merge "Fix string where it says "phone" on a tablet." into oc-dev am: efed517a8a
am: 7ab82146c1

Change-Id: I9edaf67a24c6486a6aa82c7fcbda9fced1addcdc
2017-05-04 02:30:53 +00:00
Fan Zhang
7ab82146c1 Merge "Fix string where it says "phone" on a tablet." into oc-dev
am: efed517a8a

Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f
2017-05-04 02:28:22 +00:00
TreeHugger Robot
efed517a8a Merge "Fix string where it says "phone" on a tablet." into oc-dev 2017-05-04 02:23:18 +00:00
Lorenzo Colitti
23671e84ba Merge "Add a "sign into network" button to the wifi details page." into oc-dev am: 33b0104cfc
am: fdd0f1e141

Change-Id: I528df44eb284ca162ba5daf937aa8a020d65bc4c
2017-05-04 02:15:09 +00:00
Lorenzo Colitti
fdd0f1e141 Merge "Add a "sign into network" button to the wifi details page." into oc-dev
am: 33b0104cfc

Change-Id: I38a3dfa0dcd17e073b6346dddfdd2d1434035b4a
2017-05-04 02:12:20 +00:00
Lorenzo Colitti
33b0104cfc Merge "Add a "sign into network" button to the wifi details page." into oc-dev 2017-05-04 02:06:50 +00:00
Android Build Merger (Role)
b1726776c6 Merge "Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7 am: 85950d5ebd" 2017-05-04 01:28:52 +00:00
jackqdyulei
5c39601738 Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7
am: 85950d5ebd

Change-Id: I0d3d67b274242f72fa46c157c7cee883a476a2e2
2017-05-04 01:28:37 +00:00
Android Build Merger (Role)
6502eba7e0 Merge "Merge "Fix null pointer exception in wifi settings" into oc-dev am: eb6eb99a56 am: 11853a75e3" 2017-05-04 01:28:31 +00:00
TreeHugger Robot
6c4f768e0e Merge "Add anomaly icon for PowerGaugePreference" 2017-05-04 01:28:21 +00:00
Glen Kuhne
f791573f95 Merge "Fix null pointer exception in wifi settings" into oc-dev am: eb6eb99a56
am: 11853a75e3

Change-Id: I220e8f46313c3ede6a183c6485002f3b9e921df5
2017-05-04 01:28:07 +00:00
jackqdyulei
85950d5ebd Merge "Update "Phone idle" subtext" into oc-dev
am: 3a1d6db0e7

Change-Id: I2c9b8a4c1d80911467d51ee883fb0a9a8bd01b43
2017-05-04 01:16:08 +00:00
Glen Kuhne
11853a75e3 Merge "Fix null pointer exception in wifi settings" into oc-dev
am: eb6eb99a56

Change-Id: Id7fa8980306e02e5b441278b76f01d9343119ecf
2017-05-04 01:15:47 +00:00
TreeHugger Robot
3a1d6db0e7 Merge "Update "Phone idle" subtext" into oc-dev 2017-05-04 01:11:24 +00:00
TreeHugger Robot
eb6eb99a56 Merge "Fix null pointer exception in wifi settings" into oc-dev 2017-05-04 01:04:50 +00:00
TreeHugger Robot
6643a399ba Merge "Update ConvertToFbe fragment to use InstrumentedFragment" 2017-05-04 00:55:28 +00:00
TreeHugger Robot
9168d6d105 Merge "Add icon for anomaly preference" 2017-05-04 00:42:24 +00:00
Daniel Nishi
bf1f93698e Fix a bug where override filter was always on.
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes: 37952170
Test: Settings unit test
2017-05-03 17:31:21 -07:00
Fan Zhang
91a03a9327 Fix string where it says "phone" on a tablet.
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix: 37833383
Test: visual
2017-05-03 17:03:55 -07:00
jackqdyulei
f80eaf73d9 Add icon in PowerUsageAnomalyDetails
Also add icon size in AnomalyPreference so it won't be too large.

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I124e99eba295d6600ffc73c05f73dd3c5c9de158
2017-05-03 17:02:18 -07:00
Jeremy Joslin
5231a159c7 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev am: b8eb78b321
am: 91dd31d722

Change-Id: I800795ed106e38feba9682c6d1f5ae8179c87a11
2017-05-03 23:13:42 +00:00
Jeremy Joslin
91dd31d722 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
am: b8eb78b321

Change-Id: I0be3efe4d409910fb8be30a3e667648d87d0975a
2017-05-03 23:05:59 +00:00
jackqdyulei
4cb19e74b3 Add anomaly icon for PowerGaugePreference
When the app contains anomaly, we should show anomaly icon(triangle
alert).

This cl also extracts a new method refreshAppListGroup from refreshUi.
New method is used to only refresh appListGroup. Reason for this action:

1. Improve performance(partial refresh)
2. We init AnomalyLoader in refreshUi, invoke refreshUi in
onLoadFinish will create infinite loop.

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: If54c89349e21763ca714123ac6ae884bd0f6a377
2017-05-03 16:01:55 -07:00
jackqdyulei
5dd9ad97d2 Add icon for anomaly preference
Bug: 36924669
Test: Screenshot
Change-Id: Ie0925504a36ec3778e793c1f2d9bc00f1163cf34
2017-05-03 15:57:51 -07:00
TreeHugger Robot
b8eb78b321 Merge "Allow "None" to be selected as a Network rating provider." into oc-dev 2017-05-03 22:57:16 +00:00
Fan Zhang
81682a42cf Update ConvertToFbe fragment to use InstrumentedFragment
It doesn't need to use SettingsPrefFragment.

Change-Id: I3f99fdc15afe338081baf64d8387e6b53c473a48
Fix: 37765437
Test: visual
2017-05-03 22:53:45 +00:00
Glen Kuhne
3c5bd235f3 Fix null pointer exception in wifi settings
Fixes a null pointer exception that can occur during setup wizard.

Bug: 37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
2017-05-03 15:53:16 -07:00
TreeHugger Robot
b45a9fe0a9 Merge "Add recent apps in app & notification" 2017-05-03 22:52:24 +00:00