Commit Graph

37220 Commits

Author SHA1 Message Date
Lei Yu
fe8de086ac Merge "Update anomaly High usage" into oc-dr1-dev am: 50062193c4
am: 216710961b

Change-Id: Idb6368febae133d373f76cc44eae73776358511b
2017-06-21 01:10:28 +00:00
Lei Yu
3e3dc6cf07 Merge "Update footer string in battery settings" into oc-dr1-dev am: eca713c1c2
am: 17b88aca70

Change-Id: Ic4e3802cce4147cf189ce86ecc46d12866467fd8
2017-06-21 01:10:08 +00:00
Lei Yu
5d4890d7be Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev am: 65afc6f86b
am: 76b09dfae5

Change-Id: I640153489cb5aa42f589a4320b4de6d557ddf986
2017-06-21 01:09:45 +00:00
Lei Yu
216710961b Merge "Update anomaly High usage" into oc-dr1-dev
am: 50062193c4

Change-Id: I5de568b3397dc18ee800aa866b883fe33dcb3d95
2017-06-21 01:06:55 +00:00
Lei Yu
50062193c4 Merge "Update anomaly High usage" into oc-dr1-dev 2017-06-21 01:03:42 +00:00
Lei Yu
17b88aca70 Merge "Update footer string in battery settings" into oc-dr1-dev
am: eca713c1c2

Change-Id: Iaaa78a3742a91f7d2d4e0a2edd361589fb340a39
2017-06-21 01:03:15 +00:00
Lei Yu
76b09dfae5 Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev
am: 65afc6f86b

Change-Id: Ie4169d421e4c31e0e4eb780a9b1c8b3921db3fd4
2017-06-21 01:02:56 +00:00
Lei Yu
eca713c1c2 Merge "Update footer string in battery settings" into oc-dr1-dev 2017-06-21 00:52:07 +00:00
Lei Yu
65afc6f86b Merge "Only update anomaly icon in AnomalyLoader" into oc-dr1-dev 2017-06-21 00:51:31 +00:00
Kevin Chyn
2aecf00ef1 Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev am: b4bbc52e27
am: 57d52c6b50

Change-Id: Iec562ad11b1ca6488dff21bac38c4983b2db1ca4
2017-06-20 23:47:27 +00:00
Fan Zhang
f18fa145f2 Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev am: 58d27eef9a
am: 1d3f5e55cd

Change-Id: I1f0bd8ed2dcedb9add6c63d1ab72ce30fb93ca70
2017-06-20 23:44:21 +00:00
Kevin Chyn
57d52c6b50 Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev
am: b4bbc52e27

Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b
2017-06-20 23:38:12 +00:00
TreeHugger Robot
b4bbc52e27 Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev 2017-06-20 23:36:27 +00:00
Fan Zhang
1d3f5e55cd Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev
am: 58d27eef9a

Change-Id: I352415bd83dccd9f86cf9017816d5858b0afbedb
2017-06-20 23:34:24 +00:00
jackqdyulei
563f121380 Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918 am: 7de9af3b8f
am: b7c8809d3b

Change-Id: I1d55f21e8eb11aea2d88128179381e5055d8577a
2017-06-20 23:30:24 +00:00
jackqdyulei
485acbd26c Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918 am: 9d0d6e4fcc
am: 4b5a6a5284

Change-Id: Ieff7f23d06a16ff225cea8bebc31c6b2e0d8ee97
2017-06-20 23:29:53 +00:00
jackqdyulei
1a1a223f7c Merge "Refine Anomaly detail page" into oc-dr1-dev am: aad82fa4ee
am: 4d75698dac

Change-Id: I8c54da995f49826a982937f1c464a6e142ec43c2
2017-06-20 23:29:33 +00:00
TreeHugger Robot
58d27eef9a Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev 2017-06-20 23:23:40 +00:00
jackqdyulei
b7c8809d3b Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 7de9af3b8f

Change-Id: I7230df797ff3cc6435d9145527bc962a0df9deb3
2017-06-20 23:11:47 +00:00
jackqdyulei
4b5a6a5284 Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 9d0d6e4fcc

Change-Id: If6960f114f3d42e95061a8e832f9b99695c2bd7f
2017-06-20 23:05:34 +00:00
jackqdyulei
7de9af3b8f Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: I2c12178379cfed44d6007533f420c7611038bfed
2017-06-20 23:03:00 +00:00
jackqdyulei
9d0d6e4fcc Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: If676ec0119bebed800727f618225fd355e9da74f
2017-06-20 22:55:47 +00:00
jackqdyulei
4d75698dac Merge "Refine Anomaly detail page" into oc-dr1-dev
am: aad82fa4ee

Change-Id: I0537ea1cd0c318d7c03a3a40865dcda7ea126c6b
2017-06-20 22:36:50 +00:00
TreeHugger Robot
05777a7918 Merge "Hide wifi and bt in battery settings" into oc-dev 2017-06-20 22:35:59 +00:00
TreeHugger Robot
aad82fa4ee Merge "Refine Anomaly detail page" into oc-dr1-dev 2017-06-20 22:14:55 +00:00
Lei Yu
add35b994d Merge "Update battery footer text" into oc-dr1-dev am: 2c986d9b94
am: b8d9cacae5

Change-Id: I1b697d40d8fc12ba0825fed2436ac79252a2311f
2017-06-20 21:26:02 +00:00
Kevin Chyn
00d21e3c75 FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT
Fixes: 62681560

Test: open fingerprint settings, use an unenrolled fingerprint to
authenticate 20 times in a row. Look at logs and it shouldn't be flooded
with fingerprint logs

Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988
2017-06-20 14:24:43 -07:00
Lei Yu
b8d9cacae5 Merge "Update battery footer text" into oc-dr1-dev
am: 2c986d9b94

Change-Id: I7f5ed8710ba55def643a6f17240d5b0adc25d9ca
2017-06-20 21:10:07 +00:00
jackqdyulei
75eca45b76 Update footer string in battery settings
Bug: 62422269
Test: Screenshot
Change-Id: I4b2e7c40c09878562c4fe2e8a3e8117be7ffc6fd
2017-06-20 14:08:29 -07:00
Lei Yu
2c986d9b94 Merge "Update battery footer text" into oc-dr1-dev 2017-06-20 20:58:30 +00:00
jackqdyulei
27792b2356 Only update anomaly icon in AnomalyLoader
Before this cl, it will re-calculate battery percentage once we get
anomaly data, which will add screen usage data twice. This cl make it
only update anomaly icon after the anomaly detection is done.

Bug: 62803379
Test: RunSettingsRoboTests
Change-Id: I2089646679e299fa948b1f3ed21f4a13a1317aa3
2017-06-20 13:53:46 -07:00
jackqdyulei
d10608dfbb Hide wifi and bt in battery settings
Hide them in app usage list but don't smear them

Bug: 62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
2017-06-20 13:44:52 -07:00
Maurice Lam
299985fe75 Merge "Read setup wizard theme from system properties" into oc-dr1-dev am: 1fe5766e30
am: 7a665455de

Change-Id: I3ba7e7df48d0dd1fb0593127dcc6b13ebefbea58
2017-06-20 20:11:58 +00:00
Maurice Lam
d9b04ab360 Merge "Align fingerprint illustration size" into oc-dr1-dev am: 3065eeff42
am: 84f1031a62

Change-Id: Ib537e8cd499806660673f656f22c1a3da40d5b74
2017-06-20 20:11:29 +00:00
Maurice Lam
7a665455de Merge "Read setup wizard theme from system properties" into oc-dr1-dev
am: 1fe5766e30

Change-Id: I0e8335e937342bbb1639c24cb44b25639e005b32
2017-06-20 20:07:30 +00:00
Maurice Lam
84f1031a62 Merge "Align fingerprint illustration size" into oc-dr1-dev
am: 3065eeff42

Change-Id: I84c1be2200cf0af4386035c59ec7b0a40a6b6004
2017-06-20 20:07:02 +00:00
Maurice Lam
1fe5766e30 Merge "Read setup wizard theme from system properties" into oc-dr1-dev 2017-06-20 19:57:17 +00:00
Maurice Lam
3065eeff42 Merge "Align fingerprint illustration size" into oc-dr1-dev 2017-06-20 19:56:50 +00:00
TreeHugger Robot
0a08de95e1 Merge "Clarify "importance" settings for apps not targeting O." 2017-06-20 19:33:20 +00:00
Doris Ling
1ffda54c00 Merge "Add Account.name to the tile's intent." 2017-06-20 19:07:54 +00:00
jackqdyulei
853ab1f891 Update anomaly High usage
Update the title and summary for anomaly summary preference.

Bug: 62791930
Test: RunSettingsRoboTests
Change-Id: I30ac554f227904c102d0903505e3a99966f50581
2017-06-20 11:40:29 -07:00
jackqdyulei
72c3275a66 Refine Anomaly detail page
1. Fix the layout issue(title not vertical horizontal)
2. Add subtitle for anomaly

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I9b3627f09bbe37b104644d203ff8924f0faaea47
2017-06-20 11:37:55 -07:00
Alison Cichowlas
a5d1201019 Clarify "importance" settings for apps not targeting O.
Bug: 37041902
Test: strings only; manually tested.
Change-Id: Idfa756b5f2aacf41b82192d4a40f76d5a45c722b
2017-06-20 13:30:51 -04:00
jackqdyulei
92e4e1a1ff Update battery footer text
Bug: 62422269
Test: Build
Change-Id: I9cb5edbde3c33a29edfbe03706dd2d71be6a2be0
2017-06-20 10:11:06 -07:00
Fan Zhang
a74337c627 Add logging when entity header buttons are clicked
Change-Id: I673e5b4a6c5f8736bbec72e259a82acb3f514828
Fix: 62709062
Test: make RunSettingsRoboTests
2017-06-20 16:53:14 +00:00
Sean Stout
2bc94d6271 Add Night Light Suggestion and tests
Night Light settings suggestion will only show when the user
has not previously interacted with Night Light.

Bug: 37207263
Test: make ROBOTEST_FILTER=\
"(SettingsSuggestionsTest|SuggestionFeatureProviderImplTest)"\
RunSettingsRoboTests
Change-Id: I432d5fef19f5e4a52503da136b044598cb82164a
2017-06-20 09:22:56 -07:00
Maurice Lam
7ffdb046a6 Read setup wizard theme from system properties
Test: cd tests/robotests && mma
Bug: 62060286
Change-Id: I285638736efa63314fa3e055f72ac021bce40bfe
2017-06-20 00:25:50 +00:00
Fan Zhang
c97e9bc39d Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am: 6dfafa5d95
am: f66702c930

Change-Id: Iaa8dde8ae93cf895001505e84907dfa60b9079f1
2017-06-19 23:45:43 +00:00
Fan Zhang
f66702c930 Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
am: 6dfafa5d95

Change-Id: I9f17e8f5f3ffe084567c7be7743cc7b62a4e482d
2017-06-19 23:33:13 +00:00
TreeHugger Robot
6dfafa5d95 Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev 2017-06-19 23:21:13 +00:00