OSDN Git Service
Matthew Fritze [Fri, 9 Jun 2017 01:29:15 +0000 (01:29 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33 am:
d07e14fb5b
am:
e844588e0e
Change-Id: I25ec3fe7798ec88fa91028914e11ee519ef74662
Matthew Fritze [Fri, 9 Jun 2017 01:28:48 +0000 (01:28 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33 am:
824f25320a
am:
0514c19273
Change-Id: Ia9baa982a544d126bd175c0112f240aa73412857
Matthew Fritze [Fri, 9 Jun 2017 01:26:29 +0000 (01:26 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33
am:
d07e14fb5b
Change-Id: Ib7114a07a0bf7b2a6fdf3129f641846b46e9b777
Matthew Fritze [Fri, 9 Jun 2017 01:25:38 +0000 (01:25 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33
am:
824f25320a
Change-Id: I11bf6fe5cfc5acb63cee7c8b4e35e2b518c7604b
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I649a4122952a41b31ee66b0daab8607b683d3e19
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I1bc6297cc75aa833184a00598f5930aa3ca114dc
TreeHugger Robot [Fri, 9 Jun 2017 01:19:37 +0000 (01:19 +0000)]
Merge "Search results always highlight proper results" into oc-dev
Doris Ling [Fri, 9 Jun 2017 01:15:38 +0000 (01:15 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev am:
73e03e6ca2
am:
94fa9d8f6e
Change-Id: I7ae8afa33248302f55126cbc6d4f0e89a7f41eee
Doris Ling [Fri, 9 Jun 2017 01:13:36 +0000 (01:13 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev
am:
73e03e6ca2
Change-Id: I339b129e599c11136add30af66514d783ee94554
TreeHugger Robot [Fri, 9 Jun 2017 01:10:46 +0000 (01:10 +0000)]
Merge "Increase visibilities in SearchFragment and SearchResutlsAdapter for testing"
TreeHugger Robot [Fri, 9 Jun 2017 01:09:24 +0000 (01:09 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Add intent action to support page"
Daniel Nishi [Fri, 9 Jun 2017 00:30:31 +0000 (00:30 +0000)]
Merge "Merge "Update the music files icon." into oc-dev am:
47c6afde7f am:
60287a50e8" into oc-dr1-dev-plus-aosp
am:
feaa8fe083
Change-Id: Ifdf5877774b4022a118fa9231aaee1fe6f4a3579
Daniel Nishi [Fri, 9 Jun 2017 00:30:02 +0000 (00:30 +0000)]
Merge "Update the music files icon." into oc-dev am:
47c6afde7f am:
f928324747
am:
b50e0063e2
Change-Id: I090bf8bc49e06259f70da79ffc0f345dd0bbd883
Android Build Merger (Role) [Fri, 9 Jun 2017 00:20:57 +0000 (00:20 +0000)]
Merge "Merge "Update the music files icon." into oc-dev am:
47c6afde7f am:
60287a50e8" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 9 Jun 2017 00:20:34 +0000 (00:20 +0000)]
Merge "Update the music files icon." into oc-dev am:
47c6afde7f
am:
60287a50e8
Change-Id: I6a51ed255964fb115e1be9e288cc9d71afe0b969
Daniel Nishi [Fri, 9 Jun 2017 00:20:31 +0000 (00:20 +0000)]
Merge "Update the music files icon." into oc-dev am:
47c6afde7f
am:
f928324747
Change-Id: I3726c2842bf3957564c5def187e268a0316c3cc4
Daniel Nishi [Fri, 9 Jun 2017 00:19:04 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I20505a1958f7639ac91c571371a7555c4f9b9024
Daniel Nishi [Fri, 9 Jun 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I78e6e1a16e25aff0e0374f5910fcbba0624f712b
TreeHugger Robot [Fri, 9 Jun 2017 00:15:25 +0000 (00:15 +0000)]
Merge "Create new category for lock screen redaction"
TreeHugger Robot [Fri, 9 Jun 2017 00:13:18 +0000 (00:13 +0000)]
Merge "Update the music files icon." into oc-dev
Alex Kulesza [Thu, 8 Jun 2017 23:44:49 +0000 (23:44 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev am:
bf9cb113c1
am:
68be1736d3
Change-Id: Ie29e3ccc04512b1b999a94c1bc8867f5a4cbadf6
Alex Kulesza [Thu, 8 Jun 2017 23:28:28 +0000 (23:28 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
am:
bf9cb113c1
Change-Id: I7dc6abaa4f9033492e848aa0977349e375991ec1
Matthew Fritze [Wed, 7 Jun 2017 00:14:33 +0000 (17:14 -0700)]
Search results always highlight proper results
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.
This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.
Instead, we calculate index right before we highlight.
Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes:
62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
TreeHugger Robot [Thu, 8 Jun 2017 23:23:00 +0000 (23:23 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
Bill Yi [Thu, 8 Jun 2017 23:01:23 +0000 (23:01 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours am:
52c0cd702c -s ours
am:
94e485819c -s ours
Change-Id: I0eb4dfe4e6ea190053a142f94a9c0fc93619124e
Bill Yi [Thu, 8 Jun 2017 23:00:31 +0000 (23:00 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours am:
7134ca433b -s ours
am:
a372e3c40e -s ours
Change-Id: I8283273a50b4d45c7716101d07aa5c0e0a645963
Bill Yi [Thu, 8 Jun 2017 22:55:00 +0000 (22:55 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours
am:
52c0cd702c -s ours
Change-Id: I9b2a91a8a00da16ed51f3a2c36c8f7bc5eebe990
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:48:47 +0000 (22:48 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: Iaec93787ba7a7e2eb885893842cea02932e16abe
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
Soroosh Mariooryad [Fri, 2 Jun 2017 00:10:53 +0000 (17:10 -0700)]
Increase visibilities in SearchFragment and SearchResutlsAdapter for testing
Test: RunSettingsRoboTests
Bug:
36867802
Change-Id: I9102d02a5500330ce53e742ecd2084f0e714b830
Maurice Lam [Thu, 8 Jun 2017 18:57:40 +0000 (11:57 -0700)]
Add intent action to support page
Test: cd tests/robotests && mma
Bug:
62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
Doris Ling [Wed, 7 Jun 2017 21:16:43 +0000 (14:16 -0700)]
Update text for Languages & Input.
- update preference title to include gesture
- if assist gesture is supported, set summary text to reflect assist
status
Change-Id: I79477f331ae447d2505a1519da09886bf07ba1a2
Fix:
62219660
Test: make RunSettingsRoboTests
Lei Yu [Thu, 8 Jun 2017 18:08:03 +0000 (18:08 +0000)]
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev am:
377907ebad
am:
d16769a168
Change-Id: I209de5071a31c0c0da8a1822914b7ed3d3fbf41e
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
Daniel Nishi [Mon, 5 Jun 2017 21:35:29 +0000 (14:35 -0700)]
Update the music files icon.
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes:
62291640
Test: Manual
Alex Kulesza [Tue, 6 Jun 2017 23:24:48 +0000 (19:24 -0400)]
Implement general projection curve support for UsageGraph.
Previously, projections were hard-coded in UsageGraph as lines from the
last known point to the corner of the graph. This change replaces that
with support for arbitrary projection curves. Logic for hiding/showing
the projection is now gone; if the client does not want a projection,
it simply does not supply one.
There are two active clients of this code: the data usage graph and the
battery usage graph. The data graph does not use projections and is
essentially unchanged. The battery graph now implements its linear
extrapolation directly in BatteryInfo.
Bug:
38400320
Test: make SettingsUnitTests SettingsGoogleUnitTests
Test: manual (screenshots in comments)
Change-Id: I754e66f6b18ecb8b936143399f8e9e3368fc1ce4
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 07:03:41 +0000 (07:03 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am:
9e94d80fa5 am:
74f5dc85b9
am:
9c105007c3
Change-Id: Ie9853753e4e4cdd378b601aaf396587112dec55d
Bartosz Fabianowski [Thu, 8 Jun 2017 07:03:11 +0000 (07:03 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am:
9e94d80fa5 am:
25f0d19504
am:
cb8242c21d
Change-Id: I22e48b8c79917f9d73c1d365cde5ab454d05ba62
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
Maurice Lam [Thu, 8 Jun 2017 03:59:51 +0000 (20:59 -0700)]
Create new category for lock screen redaction
So that we can show it without all the other default setup wizard
only actions.
Test: Manual
Bug:
62278041
Change-Id: Iba8a626b9b6e1ae909b4f6260dae7c0462b92627
jackqdyulei [Thu, 8 Jun 2017 02:19:32 +0000 (02:19 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev am:
f5f51c4cf2 am:
0d889079af
am:
6718f67018
Change-Id: I892f5bd9ad01c65cb45ae18f18e84ca7a8f0f854
jackqdyulei [Thu, 8 Jun 2017 02:19:10 +0000 (02:19 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev am:
f5f51c4cf2 am:
33cb1408e2
am:
83bcc42e77
Change-Id: I05b8dfbeb11a21617e77dbe3769f80a7a64d8097
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)
TreeHugger Robot [Wed, 7 Jun 2017 21:51:57 +0000 (21:51 +0000)]
Merge "Add debug data in AnomalyLoader"
Matthew Fritze [Wed, 7 Jun 2017 21:07:54 +0000 (21:07 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev am:
9f2f9e331f am:
08bdbf3d5a
am:
d2f266bcfa
Change-Id: I37cbfce66d0e9c276a7bb4d3e3aa422781fa2c15
Matthew Fritze [Wed, 7 Jun 2017 21:07:11 +0000 (21:07 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev am:
9f2f9e331f am:
7868a7525b
am:
ec0206efda
Change-Id: If7e5824da83c0adc5701f9a40ca38b4b0b5bc836
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"
jackqdyulei [Fri, 2 Jun 2017 22:00:43 +0000 (15:00 -0700)]
Add debug data in AnomalyLoader
Bug:
62299540
Test: RunSettingsRoboTests
Change-Id: Id20db9fc0da8e090385caa982f2fb5a6fa0b2f38
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
OSDN Git Service
