Commit Graph

37383 Commits

Author SHA1 Message Date
TreeHugger Robot
c26ae0677e Merge "Fix typo in metrics constants" 2017-06-26 21:06:48 +00:00
Fan Zhang
9861c95577 Fix typo in metrics constants
Change-Id: If73ca178c6f3f5544ae2f5a0cc030e307d7df8c5
Fix: 62955794
Test: robotests
2017-06-26 12:13:55 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Andrew Sapperstein
4bac421538 Remove logic for adding a search icon to action bar. am: a2dd9978d4
am: a7dd97a4c9

Change-Id: I4e1f2e9e792642257f538696afe8f9aca396cdbb
2017-06-25 23:14:45 +00:00
Andrew Sapperstein
a7dd97a4c9 Remove logic for adding a search icon to action bar.
am: a2dd9978d4

Change-Id: Ifbc919113e129e997d20a89069e159fc5963ee1c
2017-06-25 23:12:44 +00:00
Andrew Sapperstein
a2dd9978d4 Remove logic for adding a search icon to action bar.
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.

Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes: 62230804
Bug: 37477506
Test: robotests
2017-06-25 13:51:08 -07:00
Andrew Sapperstein
8511745982 Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev am: 74a350f9c9
am: ee3e1af182

Change-Id: Ib5cc4974d2b7d42f9518fb34bdca815da22d8bd3
2017-06-24 05:03:31 +00:00
Jack Yu
3f83028264 Merge "Refactored area update info support" into oc-dr1-dev am: 698dc94151
am: fa283cfff1

Change-Id: I09637a7737d35354c1c8faebabdf063da78bdc33
2017-06-24 04:55:48 +00:00
Andrew Sapperstein
ee3e1af182 Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
am: 74a350f9c9

Change-Id: I5f90f5dc56765ab16e9bc6879fe84d3fe31ce0df
2017-06-24 04:54:51 +00:00
Jack Yu
fa283cfff1 Merge "Refactored area update info support" into oc-dr1-dev
am: 698dc94151

Change-Id: I8df78f80b3bcadcb9c3a409cea5f75f64f76ed38
2017-06-24 04:47:53 +00:00
TreeHugger Robot
74a350f9c9 Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev 2017-06-23 23:44:49 +00:00
Jack Yu
698dc94151 Merge "Refactored area update info support" into oc-dr1-dev 2017-06-23 23:13:52 +00:00
TreeHugger Robot
e5f23a664e Merge "Disable managed services special access screens..." 2017-06-23 22:34:56 +00:00
jackqdyulei
e4fefa6502 Merge "Change the method to get foreground time." into oc-dr1-dev am: 9463219048
am: 3829eca2d8

Change-Id: I3b6b2a38534feb99b6c795c660734093cb7bbb2e
2017-06-23 21:44:35 +00:00
jackqdyulei
3829eca2d8 Merge "Change the method to get foreground time." into oc-dr1-dev
am: 9463219048

Change-Id: Iab042eb8275c05f4a9cb6c222c3bfe3279582669
2017-06-23 21:33:02 +00:00
Andrew Sapperstein
466a3f6faa Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled
Instead, this decision is being handled via AnomalyDetectionPolicy.

Change-Id: I5b1831c78e31e3be984dda07bcea9f0b0a25d52f
Fixes: 62871629
Test: robotests
2017-06-23 14:32:22 -07:00
TreeHugger Robot
9463219048 Merge "Change the method to get foreground time." into oc-dr1-dev 2017-06-23 21:28:34 +00:00
Maurice Lam
2e44cb0f17 Add fingerprint backup message am: d793590678
am: d396208233

Change-Id: I857fd458c046fa053000f7b41280310ce73f73f1
2017-06-23 20:53:41 +00:00
Maurice Lam
d396208233 Add fingerprint backup message
am: d793590678

Change-Id: I431ad2491085b9bccc1b90a117a30497f4156c9e
2017-06-23 20:48:45 +00:00
Julia Reynolds
559bd3651e Disable managed services special access screens...
... on low ram devices.

- Remove them from the 'Special app access' screen
- Display an error message if an app intents directly to
them

Bug: 35219985
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java,
when the device is in low ram mode and when it's not.
Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac
2017-06-23 15:44:43 -04:00
Maurice Lam
d793590678 Add fingerprint backup message
Test: Manual
Bug: 62844631
Change-Id: I7ce5fd4033c9f37f7aa170750edc7ffe0b583fcf
2017-06-23 11:33:41 -07:00
jackqdyulei
3d93fc16f4 Change the method to get foreground time.
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);

Bug: 62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
2017-06-23 11:02:54 -07:00
Fan Zhang
c85c84f12b Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am: e28599049e
am: 88ce094235

Change-Id: Iefc8c7173e6d375d1045a3b148ba5c0f11c426e2
2017-06-23 17:47:36 +00:00
Fan Zhang
88ce094235 Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev
am: e28599049e

Change-Id: I4ee4f15c73d8ef633704553b8147c3c3c3a02a6c
2017-06-23 17:34:00 +00:00
TreeHugger Robot
e28599049e Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev 2017-06-23 17:27:59 +00:00
Bill Yi
49b5de942e Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: bbeaae705d -s ours
am: a043cf04df  -s ours

Change-Id: I335191d70ae5fe79fe7d1ea9c334ecd6d82a60e3
2017-06-23 13:31:23 +00:00
Bill Yi
c8c242379a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6300674d27 -s ours
am: 995b3898c4  -s ours

Change-Id: I8be17d45e727141f2d6690a2afa02526c9eb50a0
2017-06-23 13:30:51 +00:00
Bill Yi
a90c3c8948 Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours am: 5386943cf2 -s ours
am: 16ec3c30e5  -s ours

Change-Id: I03cc46fad1b0c82b4ee4d6460f320c278a7fa250
2017-06-23 13:30:03 +00:00
Bill Yi
a043cf04df Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
am: bbeaae705d  -s ours

Change-Id: I2125118b568ea7d81b37a7c944d6c16d75742824
2017-06-23 13:00:52 +00:00
Bill Yi
995b3898c4 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6300674d27  -s ours

Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c
2017-06-23 13:00:07 +00:00
Bill Yi
16ec3c30e5 Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
am: 5386943cf2  -s ours

Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab
2017-06-23 12:48:51 +00:00
Bill Yi
bbeaae705d Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9
2017-06-23 12:39:42 +00:00
TreeHugger Robot
6300674d27 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-23 12:32:32 +00:00
Bill Yi
5386943cf2 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic3856a964218fae0861218de0ca46f3d50820e5f
2017-06-23 12:29:05 +00:00
TreeHugger Robot
6b1ff7073a Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56 Import translations. DO NOT MERGE
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
Bill Yi
0695fc5d2b Import translations. DO NOT MERGE
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
2017-06-23 01:33:27 -07:00
Daniel Nishi
f9b3997a71 Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
am: d570ab1595

Change-Id: If3eac200a1e775165415382f5e63c50b6c65dc11
2017-06-23 04:44:59 +00:00
Daniel Nishi
c758c52ab0 Count cache in storage categories. am: b22b85b593 am: 5837a9b98b
am: 41400d022c

Change-Id: Iee95e7d07f0642aec5bc478c8929bb4b50d3d3ec
2017-06-23 04:37:22 +00:00
Android Build Merger (Role)
d570ab1595 Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp 2017-06-23 04:30:21 +00:00
Daniel Nishi
41400d022c Count cache in storage categories. am: b22b85b593
am: 5837a9b98b

Change-Id: If5107df5ea57dc782e76cd6444f38c9feaff037f
2017-06-23 04:28:49 +00:00
Daniel Nishi
1b1d779ed4 Count cache in storage categories. am: b22b85b593
am: b57a71fe08

Change-Id: Id280446eddddafbd7445a11ad42d1f66320b9128
2017-06-23 04:28:43 +00:00
Daniel Nishi
5837a9b98b Count cache in storage categories.
am: b22b85b593

Change-Id: I85b6ce492c34f67215dcb8539e7b88b02a9ef2fa
2017-06-23 04:19:19 +00:00
Daniel Nishi
b57a71fe08 Count cache in storage categories.
am: b22b85b593

Change-Id: Idf44c0cd337cbd9aefc12dce8adecf97b4dc2d99
2017-06-23 04:19:16 +00:00
Daniel Nishi
b22b85b593 Count cache in storage categories.
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).

Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes: 62623731
Test: Settings Unit Test
2017-06-22 19:08:48 -07:00
Fan Zhang
9ef5f21b8a Merge "Load regulatory info from /data/misc" into oc-dr1-dev am: f964e8c3b2
am: 9f7227eb59

Change-Id: I2421dba06e793b62ed3abb2dde041b8d0e1f0d29
2017-06-23 01:47:45 +00:00
Fan Zhang
9f7227eb59 Merge "Load regulatory info from /data/misc" into oc-dr1-dev
am: f964e8c3b2

Change-Id: I39d82c1332362c2e4f90c793a9c5ef44d297353a
2017-06-23 01:43:15 +00:00
TreeHugger Robot
f964e8c3b2 Merge "Load regulatory info from /data/misc" into oc-dr1-dev 2017-06-23 01:37:47 +00:00
Marie Janssen
c65f852b3e Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp
am: 297ab4cbf7

Change-Id: Id5ae9b091e48fe1d903276529f37253c89c4179e
2017-06-23 00:32:29 +00:00
Marie Janssen
0088711037 Bluetooth: Make notifications local-only am: 1138397336 am: 0efa2b3427
am: 56adef485a

Change-Id: I859ca92f0f3ba63dfbe5d3beb54264c371542d9a
2017-06-23 00:31:52 +00:00