OSDN Git Service
Bill Yi [Thu, 8 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours
am:
7134ca433b -s ours
Change-Id: Ieacc318862dce2ea16bcf451fd24a1f2a47b8a27
Bill Yi [Thu, 8 Jun 2017 22:46:57 +0000 (22:46 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: I436ea7a7e5a758581ed5b4e0c6aa0bc3773d702c
Lei Yu [Thu, 8 Jun 2017 18:05:05 +0000 (18:05 +0000)]
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
am:
377907ebad
Change-Id: Ib201d8b7358c05017d8c22ad9a50233599ee123e
Lei Yu [Thu, 8 Jun 2017 17:59:33 +0000 (17:59 +0000)]
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
Bill Yi [Thu, 8 Jun 2017 14:59:38 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I118bf54c3426f15db267545b83e9478177d13a06
Auto-generated-cl: translation import
Bartosz Fabianowski [Thu, 8 Jun 2017 06:27:55 +0000 (06:27 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am:
9e94d80fa5
am:
74f5dc85b9
Change-Id: I36ba87aa3ee099575a11ed36409e505bb60a95b3
Bartosz Fabianowski [Thu, 8 Jun 2017 06:25:12 +0000 (06:25 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am:
9e94d80fa5
am:
25f0d19504
Change-Id: I86e43483ea616ed0f4bc58fdcd8a1a0e0bab7097
Bartosz Fabianowski [Thu, 8 Jun 2017 06:13:42 +0000 (06:13 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
am:
9e94d80fa5
Change-Id: I8056fc4d13f3e8528c1297ee3fe6f432ff7bc6dc
Bartosz Fabianowski [Thu, 8 Jun 2017 05:55:40 +0000 (05:55 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
am:
9e94d80fa5
Change-Id: Ic9c510dac141664020567877d501da6289b633b4
TreeHugger Robot [Thu, 8 Jun 2017 05:51:14 +0000 (05:51 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 02:18:23 +0000 (02:18 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev am:
f5f51c4cf2
am:
0d889079af
Change-Id: Ib3311462c4e02249993351a52df9dffd6ef8ff7a
jackqdyulei [Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev am:
f5f51c4cf2
am:
33cb1408e2
Change-Id: I98d07e6a1194d71c9a2baaaf8ae08f159ff03a76
jackqdyulei [Thu, 8 Jun 2017 02:14:25 +0000 (02:14 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
am:
f5f51c4cf2
Change-Id: Ic97c8e2020f642cf7abba063e194796afe85bb58
jackqdyulei [Thu, 8 Jun 2017 02:13:24 +0000 (02:13 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
am:
f5f51c4cf2
Change-Id: Ifd36cd50e2f4528dae247e99aafb5e93d916351e
TreeHugger Robot [Thu, 8 Jun 2017 02:10:28 +0000 (02:10 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
jackqdyulei [Fri, 2 Jun 2017 22:00:43 +0000 (15:00 -0700)]
Add debug data in AnomalyLoader
Bug:
62299540
Test: RunSettingsRoboTests
Change-Id: Id20db9fc0da8e090385caa982f2fb5a6fa0b2f38
(cherry picked from commit
5753e6d97ed50ee6130530140766607bc4bfa6b8)
Matthew Fritze [Wed, 7 Jun 2017 20:54:55 +0000 (20:54 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev am:
9f2f9e331f
am:
08bdbf3d5a
Change-Id: Id756ce10347c9420274358b8b854c2d61bd5907b
Matthew Fritze [Wed, 7 Jun 2017 20:52:24 +0000 (20:52 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev am:
9f2f9e331f
am:
7868a7525b
Change-Id: Ia3b0ce129374c199f212707527639ee21b25bb5f
Matthew Fritze [Wed, 7 Jun 2017 20:46:57 +0000 (20:46 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
am:
9f2f9e331f
Change-Id: I478def41cfe2e639ec6d93ef9bbe2d79fda46142
Matthew Fritze [Wed, 7 Jun 2017 20:46:56 +0000 (20:46 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
am:
9f2f9e331f
Change-Id: Ie3fe1e8a7d2ac0c4045209403966dd80b7c4b5fa
TreeHugger Robot [Wed, 7 Jun 2017 20:39:36 +0000 (20:39 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
jackqdyulei [Wed, 7 Jun 2017 20:20:47 +0000 (13:20 -0700)]
Use default package in BatteryEntry
Before this cl, we use the first package name if there is a name
list in BatterySipper.
We should use BatteryEntry.defaultPackageName instead, which could
describle the batterysipper more accurately.
Bug:
62417935
Test: RunSettingsRoboTests
Change-Id: I44fa151c0cf8f14cba305f179c7e94e5bc3ce434
Matthew Fritze [Wed, 7 Jun 2017 15:59:30 +0000 (08:59 -0700)]
Hide Display Theme from search results when not available
Test: make RunSettingsRoboTests
Fixes:
62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
Bartosz Fabianowski [Tue, 6 Jun 2017 15:33:30 +0000 (17:33 +0200)]
Add keys to all Preferences on the Managed device info page
In order to be able to hide the page from search results, all Preferences
(and PreferenceCategories) must have android:keys.
Bug:
62285529
Test: The Settings framework will have a test that ensure each Preference
Test: has a key from O-DR onward
Change-Id: I1e41ce6f8b9f90155ef92354b9268e9e720e1e73
TreeHugger Robot [Wed, 7 Jun 2017 02:36:12 +0000 (02:36 +0000)]
Merge "Add saturation boost setting"
TreeHugger Robot [Wed, 7 Jun 2017 02:08:55 +0000 (02:08 +0000)]
Merge "Update battery & storage settings to use headline font."
TreeHugger Robot [Wed, 7 Jun 2017 01:17:48 +0000 (01:17 +0000)]
Merge "Include home app when searching installed apps"
Romain Guy [Tue, 6 Jun 2017 01:44:47 +0000 (18:44 -0700)]
Add saturation boost setting
Bug:
62238038 62377592 38225028
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=com.android.settings.display.ColorModePreferenceControllerTest
Change-Id: Iae8f4b25966ff28fde127e6103b2c03c67862cf0
William Luh [Wed, 7 Jun 2017 00:11:33 +0000 (00:11 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev am:
f702e39156
am:
5a4603f5b3
Change-Id: Id6fccb0b75aafc2097b57f538dd9218067f30431
Alison Cichowlas [Wed, 7 Jun 2017 00:11:08 +0000 (00:11 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev am:
9fa5e66a66
am:
59b4e5b6c4
Change-Id: I0661ae34df7dcca80b394e9751ce91dd2f5f25e1
William Luh [Wed, 7 Jun 2017 00:10:26 +0000 (00:10 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev am:
9f7e705426
am:
802f3e56d3
Change-Id: I4dec2d4211a57da31d0e3006945acd0588ee514c
William Luh [Tue, 6 Jun 2017 23:57:31 +0000 (23:57 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
am:
f702e39156
Change-Id: I3e45e09f609428bd7abe46629d68adf54c5b357b
Alison Cichowlas [Tue, 6 Jun 2017 23:57:05 +0000 (23:57 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
am:
9fa5e66a66
Change-Id: Iafb44eeb33fc626633ed885a2a18ed1cbe95ee48
William Luh [Tue, 6 Jun 2017 23:56:36 +0000 (23:56 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev
am:
9f7e705426
Change-Id: I397599ce60a3a334aae17ad77dfa94c4e7b24398
TreeHugger Robot [Tue, 6 Jun 2017 23:52:47 +0000 (23:52 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 23:34:42 +0000 (23:34 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 23:31:07 +0000 (23:31 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev
Andrew Sapperstein [Tue, 6 Jun 2017 01:48:10 +0000 (18:48 -0700)]
Update battery & storage settings to use headline font.
Updates several locations to use config_headlineFontFamily as the
android:fontFamily or Typeface object. This allows OEMs to specify
a custom headline font.
Bug:
36855735
Test: ag/
2360364
Change-Id: I627515d2afd5ff018aae10843d099b8c83880635
Daniel Sheng [Tue, 6 Jun 2017 23:26:05 +0000 (23:26 +0000)]
Merge "Camera lift settings are now default-on."
Fan Zhang [Tue, 6 Jun 2017 23:08:13 +0000 (16:08 -0700)]
Include home app when searching installed apps
Change-Id: I4677307bb23f03ed7fb224c32312be7cb114763d
Fix:
62221174
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 6 Jun 2017 23:03:56 +0000 (23:03 +0000)]
Merge "Add logging to track search no-result case"
Lorenzo Colitti [Tue, 6 Jun 2017 22:40:32 +0000 (22:40 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev am:
85395155fb
am:
1185ea72f2
Change-Id: Id2661d1f4edac5d987f122542176372b2f99ef3b
Lorenzo Colitti [Tue, 6 Jun 2017 22:35:42 +0000 (22:35 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev
am:
85395155fb
Change-Id: Iae57ad27902d3dcb5406007ddc21bb03545bfcea
Lorenzo Colitti [Tue, 6 Jun 2017 22:24:42 +0000 (22:24 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev
Daniel Sheng [Tue, 30 May 2017 17:14:57 +0000 (10:14 -0700)]
Camera lift settings are now default-on.
Bug:
62102062
Test: make RunSettingsRoboTests
Changing camera lift trigger setting to default-on.
Change-Id: Id4918ce3ecf82271989741cce54729e8fd49ae52
William Luh [Tue, 6 Jun 2017 17:27:26 +0000 (10:27 -0700)]
Make icons colorful for Security settings.
Bug:
37997112
Test: make RunSettingsRoboTests
Change-Id: I287b5321cab0d4432fae61cf5565251180f37f5f
Alison Cichowlas [Tue, 6 Jun 2017 19:06:14 +0000 (15:06 -0400)]
If two groups are posted to settings, remove old group and log.
Bug:
62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
Daniel Nishi [Tue, 6 Jun 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Use the config default days to retain."
Fan Zhang [Tue, 6 Jun 2017 19:37:52 +0000 (12:37 -0700)]
Add logging to track search no-result case
Change-Id: Iea95468c33e6663c0dad374954468947575bb3df
Fix:
37211659
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 6 Jun 2017 20:23:08 +0000 (20:23 +0000)]
Merge "Fix master build"
Fan Zhang [Tue, 6 Jun 2017 20:06:25 +0000 (13:06 -0700)]
Fix master build
Caused by bad merge from ag/
2360433
Test: make RunSettingsRoboTests
Change-Id: I3fb55768686a6edc56dee60421c116dcf590239f
Hiroki Yamamoto [Tue, 6 Jun 2017 19:47:06 +0000 (19:47 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041 am:
56a8267f59 am:
77452b8a57
am:
a1f5332068
Change-Id: If7351ccb7896cc1cfeb83837b09650a50ed1b55a
TreeHugger Robot [Tue, 6 Jun 2017 19:44:18 +0000 (19:44 +0000)]
Merge "Refactor anomaly detection"
Hiroki Yamamoto [Tue, 6 Jun 2017 19:34:49 +0000 (19:34 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041 am:
56a8267f59
am:
77452b8a57
Change-Id: I19237cb1f24dc1f0b127b2bd2476ee1f3a28b0bb
Hiroki Yamamoto [Tue, 6 Jun 2017 19:28:41 +0000 (19:28 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041
am:
56a8267f59
Change-Id: Idca7ade0068f390289c7c13d1765fead6e0e1d35
Hiroki Yamamoto [Tue, 6 Jun 2017 19:22:09 +0000 (19:22 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
am:
e990bf3041
Change-Id: I2b2978a82a9dbee948b4e50f2b85978b9ddb58e5
Andrew Sapperstein [Tue, 6 Jun 2017 19:16:56 +0000 (19:16 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev am:
dfc1983601
am:
b5fb71acc6 -s ours
Change-Id: Ifbfc8f7153fddc1f88b52f3475e17629034c20d8
Treehugger Robot [Tue, 6 Jun 2017 19:12:53 +0000 (19:12 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
Matthew Fritze [Tue, 6 Jun 2017 19:11:26 +0000 (19:11 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev am:
2046c59b77
am:
74eda7150b
Change-Id: Id496fc3d44f5103c65aa7b4de8ebcfab54f5de7b
Andrew Sapperstein [Tue, 6 Jun 2017 19:11:03 +0000 (19:11 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev am:
37f87b6c64
am:
93adcee630 -s ours
Change-Id: I6871d37124fb138b50d486764f32af9b14bb5521
Andrew Sapperstein [Tue, 6 Jun 2017 19:10:43 +0000 (19:10 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev
am:
dfc1983601
Change-Id: I6c143b18b53857accac23d7c64f807c6987609a5
TreeHugger Robot [Tue, 6 Jun 2017 19:04:25 +0000 (19:04 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 19:00:29 +0000 (19:00 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev
am:
2046c59b77
Change-Id: I549f1aa455ffbff0119dd00ef782710992100cce
Andrew Sapperstein [Tue, 6 Jun 2017 19:00:04 +0000 (19:00 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
am:
37f87b6c64
Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea
TreeHugger Robot [Tue, 6 Jun 2017 18:52:30 +0000 (18:52 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 18:42:24 +0000 (18:42 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 18:13:41 +0000 (18:13 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am:
b8028f63ec
am:
64736b6ae1
Change-Id: I7267309d17ae503144eb11789888937af6c8a0e1
William Luh [Fri, 26 May 2017 23:10:51 +0000 (16:10 -0700)]
Use the standard place holder for the security summary. DO NOT MERGE
This removes the jitter when the cache is empty and there is
initially no summary, and then it is replaced by the fetched summary
when it's available.
Bug:
36463348
Test: make RunSettingsRoboTests
Change-Id: I92cafbf23e3c562a470488dea28fd5106bbdf885
Matthew Fritze [Tue, 6 Jun 2017 17:58:30 +0000 (17:58 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
am:
b8028f63ec
Change-Id: I47066c45b6ee286a2f1eac5ba1d57a5de058652c
Daniel Nishi [Tue, 6 Jun 2017 17:46:33 +0000 (17:46 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev am:
b5abb2c1d2
am:
0be5066922
Change-Id: Icf83d3412e0c87c5dbcb98156c0310a6db5b7645
TreeHugger Robot [Tue, 6 Jun 2017 17:44:21 +0000 (17:44 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 17:40:32 +0000 (17:40 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev am:
02e360dbc9
am:
3a7f413468
Change-Id: I021c720d4a70af6e07d9de034cbc09c2b4fceeff
Daniel Nishi [Tue, 6 Jun 2017 17:40:04 +0000 (17:40 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev
am:
b5abb2c1d2
Change-Id: I8bd8b052cd8c437dd858a459c8098e39878b4b50
Matthew Fritze [Tue, 6 Jun 2017 17:34:31 +0000 (17:34 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev
am:
02e360dbc9
Change-Id: Ic77a5d965bfb882d128182f3eaff5e0c857dd500
Daniel Nishi [Tue, 6 Jun 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:27 +0000 (16:33 +0000)]
Revert "Initial search bar implementation."
This reverts commit
14934599dd6008a79c5e0d67f1df9ba5886c5198.
Bug:
37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:13 +0000 (16:33 +0000)]
Revert "Add search bar to SearchActivity."
This reverts commit
fac61b71e5b32bf8cd464049c2750a18911b75b2.
Bug:
37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
TreeHugger Robot [Tue, 6 Jun 2017 17:25:56 +0000 (17:25 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 01:02:19 +0000 (01:02 +0000)]
Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
This reverts commit
c1e9f8787f02df0d38a9d4e93f7996318fc46355.
Reason for revert: There is an issue when dropdown menu text has a '%' sign in it.
Despite testing it on my own devices, the bug did not show up immediately.
Instead of continuing down this path for OC, we'll just revert
this patch, and then as an ugly, band-aid solution, check the
summary text for the "%s" substring, and hide it when found.
In O-DR onward, we'll look for a more permanent solution.
Change-Id: Ia7a04bfb7b09c436dc0f13564f2134a1f0c436e2
Bug:
36101902
Fix:
62211676
TreeHugger Robot [Tue, 6 Jun 2017 17:17:05 +0000 (17:17 +0000)]
Merge "Prevent showing multiple keyguard dialog in vpn setup UI"
Bill Yi [Tue, 6 Jun 2017 16:34:19 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
11465af11e -s ours
am:
d650629364 -s ours
Change-Id: I9a4dd50058845bfb7db289ebeda520b4267aa828
Bill Yi [Tue, 6 Jun 2017 16:28:22 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
11465af11e -s ours
Change-Id: I398b4773e26cb34a1ce6304d91b52df32a11e821
TreeHugger Robot [Tue, 6 Jun 2017 16:17:42 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 02:08:14 +0000 (19:08 -0700)]
Check for dynamic summaries at display time for search
In order to hide dynamic summaries which use SettingPref,
we check if the summary is equal to "%s".
This is a temporary, band-aid fix which should be
changed in the next release.
Bug:
36101902
Test: make RunSettingsRoboTests
Change-Id: I6cadb3ba68f09ba18ad9a6d2a817804c5d4a08e5
TreeHugger Robot [Tue, 6 Jun 2017 15:16:05 +0000 (15:16 +0000)]
Merge "String changes"
Salvador Martinez [Tue, 6 Jun 2017 15:04:52 +0000 (15:04 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev am:
a8e887be86
am:
4eb906a672
Change-Id: I48ee59ed5c626496de4bda51f26e25647c3cc16d
jackqdyulei [Tue, 6 Jun 2017 15:04:09 +0000 (15:04 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev am:
8fbb0bc1f2
am:
0686f63083 -s ours
Change-Id: I0877907fbfc1b8dd43d18d381ee5115150466ca8
Lorenzo Colitti [Tue, 6 Jun 2017 13:54:56 +0000 (13:54 +0000)]
Merge changes I23540440,I67269e1a into oc-dev am:
4249a7092b
am:
844c385c09
Change-Id: I258837998e0c242d4c4dd4fb7c69da8049837173
Yohann Roussel [Tue, 6 Jun 2017 10:01:43 +0000 (12:01 +0200)]
resolve merge conflicts of
1104b94dbc to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I537fb871134f801ec9489b48fe748b525e5a65ea
Hiroki Yamamoto [Tue, 6 Jun 2017 11:05:00 +0000 (20:05 +0900)]
NFC: Reset Tap&pay summary text if default payment is not set
Reset Tap&pay summary text even default payment is null
to show the correct status that is no payment service.
Test: manual
Bug:
62366917
Change-Id: Ida9cf0b205e56163505862498b1ac4d679c2c92a
TreeHugger Robot [Tue, 6 Jun 2017 06:33:48 +0000 (06:33 +0000)]
Merge "Ensure wifi ssid cannot exceed 32 bytes."
TreeHugger Robot [Tue, 6 Jun 2017 06:20:47 +0000 (06:20 +0000)]
Merge "Add help url placeholders for new pages"
Salvador Martinez [Tue, 6 Jun 2017 04:35:19 +0000 (04:35 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
am:
a8e887be86
Change-Id: I561cd90ba74a551a44d43a04a1b567efc74e4863
Salvador Martinez [Tue, 6 Jun 2017 04:29:31 +0000 (04:29 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
Fan Zhang [Tue, 6 Jun 2017 04:07:52 +0000 (04:07 +0000)]
Revert "Remove dynamic summary from Security Patch info"
The change breaks build
Bug:
62359766
Bug:
36101902
This reverts commit
2b562f84b6c317711fdb70db5b4d3cb9953ed536.
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
Fan Zhang [Tue, 6 Jun 2017 04:07:52 +0000 (04:07 +0000)]
Revert "Remove dynamic summary from Security Patch info"
The change breaks build
Fix:
62359766
Bug:
36101902
This reverts commit
2b562f84b6c317711fdb70db5b4d3cb9953ed536.
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
Lorenzo Colitti [Sun, 4 Jun 2017 14:15:40 +0000 (23:15 +0900)]
Wifi details: minor ordering fixes.
1. Set mNetwork before the NetworkCallbacks can be delivered.
Previously, the code would set mNetwork in updateInfo, relying
on the fact that the BroadcastReceiver registered in onResume
is immediately invoked. However, this races with the
callbacks, which are also immediately invoked. If the
callbacks won the race, mNetwork would not be set and they
would be ignored.
2. Call updateInfo in onResume instead of in displayPreference.
This ensures that it's always called exactly once before the
activity starts running, regardless of whether it's being
displayed the first time (i.e., after onStart) or resumed
by switching from another app. displayPreference is only
called in the former case.
3. Don't call getLinkProperties and getNetworkCapabilities in
updateInfo. These calls are superfluous, because this
information is update by the NetworkCallbacks, and they can
cause jank because updateInfo is called on the UI thread.
This requires that the tests be changed so they always call
onResume, since no UI elements are populated until onResume is
called.
Bug:
62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: Iccb1b9ae51188755d890a6df83004dbe9bec565e
jackqdyulei [Thu, 25 May 2017 18:06:34 +0000 (11:06 -0700)]
Refactor anomaly detection
This cl refactor it so:
1. AnomayLoader could create its own BatteryStatsHelper if needed.
2. AnomalyDetector could detect the anomaly with a target package name
3. Remove FeatureProvider in AnomalyLoader and use
AnomalyDetectionPolicy instead
With this cl, we could add anomaly detection to battery usage page
more easily.
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: I1ee09701de8b5c8855f44e447813760285794c89
jackqdyulei [Tue, 6 Jun 2017 02:05:09 +0000 (02:05 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
am:
8fbb0bc1f2
Change-Id: Idd493f97773816dc4cc1c759bc5465a2b7f4b04f
TreeHugger Robot [Tue, 6 Jun 2017 02:04:22 +0000 (02:04 +0000)]
Merge "Import translations. DO NOT MERGE"