Commit Graph

38578 Commits

Author SHA1 Message Date
Android Build Merger (Role)
cdb44fee84 Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: ebd8308698" into oc-mr1-dev-plus-aosp 2017-07-22 00:38:00 +00:00
Andrew Sapperstein
012244e52d Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
am: ebd8308698

Change-Id: I5bcbe810c82c2a71a8cd8ff8f9ab5a6f4a6015e7
2017-07-22 00:37:40 +00:00
Android Build Merger (Role)
b0431ad1ca Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: 3ecdee573b" into oc-mr1-dev-plus-aosp 2017-07-22 00:37:19 +00:00
Fan Zhang
fab6b8cd4d Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
am: 3ecdee573b

Change-Id: Iceb537582606cca48f50de701232c8c868cc523c
2017-07-22 00:37:06 +00:00
Michael Wachenschwanz
987711712c Add Foreground Service time to battery usage
Add foreground service time to foreground usage time of apps. This will
account for app usage that user is aware of but is not being displayed
on screen, such as playing music while screen is locked.

Change-Id: Ica9fe0819e46b50299eb2eab7f0483ea01441fb0
Fixes: 38313557
Test: RunSettingsRoboTests
2017-07-21 17:37:00 -07:00
Android Build Merger (Role)
1ef1ea17b2 Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: ab7a4db9df" into oc-mr1-dev-plus-aosp 2017-07-22 00:37:00 +00:00
Lei Yu
5711e05a93 Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
am: ab7a4db9df

Change-Id: Ic8abdff3468d1670533fe7bc99915fe3132c44ee
2017-07-22 00:36:48 +00:00
Android Build Merger (Role)
465871284e Merge "Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 0531bd48e3" into oc-mr1-dev-plus-aosp 2017-07-22 00:36:43 +00:00
Antony Sargent
6055b14919 Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
am: 0531bd48e3

Change-Id: I0c7931f70db596cce9ddeb91d2bbdc3fc2a99aeb
2017-07-22 00:36:30 +00:00
Android Build Merger (Role)
3c6df33d4b Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: 80a5336b25" into oc-mr1-dev-plus-aosp 2017-07-22 00:36:29 +00:00
Christine Franks
e147a19773 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours
am: 18cd618368

Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf
2017-07-22 00:36:07 +00:00
Andrew Sapperstein
ca87892984 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77
am: 80a5336b25

Change-Id: Ib32bcfa22706abf89633b86333498f77328daebb
2017-07-22 00:36:03 +00:00
Andrew Sapperstein
ebd8308698 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77

Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
2017-07-22 00:33:13 +00:00
Fan Zhang
715f0956f4 Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24
am: ef0e290e65

Change-Id: I77ca5052477a9e1efee01c7022378164096669b8
2017-07-22 00:32:48 +00:00
Fan Zhang
3ecdee573b Merge "Tweak bluetooth name preference" into oc-dr1-dev
am: 03c595ce24

Change-Id: I1d2f8d65fb7ba48bac656222c4501306103b385c
2017-07-22 00:32:42 +00:00
Andrew Sapperstein
80a5336b25 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77

Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
2017-07-22 00:32:32 +00:00
Lei Yu
c857c195cf Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626
am: 454131cdb0

Change-Id: I3feacbe94bca351809341e60464a6834e6980a12
2017-07-22 00:32:27 +00:00
Lei Yu
ab7a4db9df Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am: 0ec3e4e626

Change-Id: Ie3e4b7ead145b22c44383443229043722b9e86d9
2017-07-22 00:32:21 +00:00
Antony Sargent
75512a3215 Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed
am: 62b7527da5

Change-Id: Ibfe8afab3bf662c2855a28c27d636da17444eb79
2017-07-22 00:32:07 +00:00
Antony Sargent
0531bd48e3 Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed

Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf
2017-07-22 00:32:00 +00:00
Christine Franks
c2bd97a5df Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
am: c350386476  -s ours

Change-Id: I6371e6575ba1b60dfe1c715c46e17be4f6340d98
2017-07-22 00:31:48 +00:00
Christine Franks
18cd618368 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am: cb9a7075f8  -s ours

Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663
2017-07-22 00:31:39 +00:00
TreeHugger Robot
59a66d9b77 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev 2017-07-22 00:28:31 +00:00
Christine Franks
8061500847 Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
am: fd8b8eb0b1

Change-Id: I2f22b732d4268af4ce2fd537746287bda8091e70
2017-07-22 00:11:01 +00:00
Christine Franks
fd8b8eb0b1 Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev 2017-07-21 23:59:23 +00:00
Bill Yi
1c6e27b4d5 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f364c30330  -s ours

Change-Id: I9aa60965b808aadc652caf17b9e7f46e639c12a7
2017-07-21 22:20:24 +00:00
TreeHugger Robot
f364c30330 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-07-21 22:16:56 +00:00
Fan Zhang
ea0e71ccc7 Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
am: 85287ec26a

Change-Id: Ieffd7131081d33db12437f0407d347eaec76c7f2
2017-07-21 22:15:54 +00:00
TreeHugger Robot
85287ec26a Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev 2017-07-21 22:09:15 +00:00
Andrew Sapperstein
64590ec7a6 Add help uri for process stats summary and apps.
Bug: 62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
2017-07-21 15:01:55 -07:00
Fan Zhang
ef0e290e65 Merge "Tweak bluetooth name preference" into oc-dr1-dev
am: 03c595ce24

Change-Id: I25e7a3c66fddb8b594e06ced3435fa02273dc68e
2017-07-21 21:47:13 +00:00
Fan Zhang
03c595ce24 Merge "Tweak bluetooth name preference" into oc-dr1-dev 2017-07-21 21:41:29 +00:00
Lei Yu
454131cdb0 Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am: 0ec3e4e626

Change-Id: Idcd210c8643f4e60375ab957bcc83136e5ffb0f3
2017-07-21 20:30:18 +00:00
Lei Yu
0ec3e4e626 Merge "Make anomaly item refresh in battery" into oc-dr1-dev 2017-07-21 20:28:01 +00:00
Antony Sargent
62b7527da5 Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed

Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe
2017-07-21 20:11:53 +00:00
Fan Zhang
b4c40e5dea Reindex db when package w/ searchIndexProvider changes
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.

Change-Id: I85d4c4a994c7ff808662371c857cac1929a8b1cd
Merged-In: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug: 63903835
Test: robotests
2017-07-21 13:06:03 -07:00
TreeHugger Robot
a6ac4890ed Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev 2017-07-21 20:03:41 +00:00
jackqdyulei
edfebbaa4f Add log for anomaly.
This cl adds all the info that need to be logged to Anomaly and add a
dump method for log.

Bug: 63776178
Test: RunSettingsRoboTests
Change-Id: If762bfca725fee07944ffa23998332c81335a37f
2017-07-21 12:39:50 -07:00
Fan Zhang
f8d95fa35d Reindex db when package w/ searchIndexProvider changes
We do this by tracking a list of package/version that provides search
indexing data. When they change, we do a full reindex.

Change-Id: I906a1524f5b1292932f63727d605283ddb7d6ee2
Bug: 63903835
Test: robotests
2017-07-21 12:38:24 -07:00
Bill Yi
2bef642280 Import translations. DO NOT MERGE
Change-Id: Ifb876a3208315c84fad355fac5204336eb8681e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-21 12:22:06 -07:00
Christine Franks
c6890ab6c5 Move logic for FR in demo mode out of Settings
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
2017-07-21 19:19:19 +00:00
Christine Franks
c350386476 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am: cb9a7075f8

Change-Id: I0b059d3c240169ff4b0cc24fd22597bd31659fe7
2017-07-21 19:05:42 +00:00
Christine Franks
cb9a7075f8 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev 2017-07-21 18:52:56 +00:00
Android Build Merger (Role)
f5bb4e9a8a Merge "Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am: e09338a208 -s ours am: 50ac1cebc3" into oc-mr1-dev-plus-aosp 2017-07-21 18:51:46 +00:00
Fan Zhang
73f6cefa1a Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am: e09338a208 -s ours
am: 50ac1cebc3

Change-Id: Ie6554b2f6ca85e9805b40582d0a6f058aa0abc4e
2017-07-21 18:51:19 +00:00
Fan Zhang
a5124c9dcf Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am: e09338a208
am: 8df2cef10d  -s ours

Change-Id: I3156fe7bfd6f2383b18457cf4a854059c26b6f0a
2017-07-21 18:51:14 +00:00
Fan Zhang
50ac1cebc3 Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am: e09338a208  -s ours

Change-Id: Iabafe1e7ffdd70fa9694cf4e293d83b4aef6bba8
2017-07-21 18:42:40 +00:00
Fan Zhang
9218e3b7df Tweak bluetooth name preference
- remove accent color from device name
- remove useless ripple when tap

Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix: 62891178
Test: robotests
2017-07-21 11:38:09 -07:00
Fan Zhang
8df2cef10d Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am: e09338a208

Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
2017-07-21 18:23:56 +00:00
Fan Zhang
e09338a208 Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev 2017-07-21 18:18:44 +00:00