Commit Graph

38465 Commits

Author SHA1 Message Date
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
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
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
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
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
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
jackqdyulei
88b27fdeac Make anomaly item refresh in battery
Bug: 63908155
Test: RunSettingsRoboTest
Change-Id: I3e220001ca989020447403641360fade4d09e969
2017-07-21 10:37:14 -07:00
Doris Ling
9275814c02 Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
am: a39daa25e7

Change-Id: Iaf765d32f99018f2a6372e87523f8b83df97c584
2017-07-21 17:26:33 +00:00
Doris Ling
a39daa25e7 Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev 2017-07-21 17:19:12 +00:00
Android Build Merger (Role)
073e23286a Merge "Zen settings screen update am: 56b748d686 am: 4faa353f02" into oc-mr1-dev-plus-aosp 2017-07-21 16:27:31 +00:00
Julia Reynolds
fb2452f5d9 Zen settings screen update am: 56b748d686
am: 4faa353f02

Change-Id: Ifd7d390db0373561b9a5536b412373579dadc8e3
2017-07-21 16:27:18 +00:00
Julia Reynolds
eff648bf76 Zen settings screen update am: 56b748d686
am: 6ad9f3267b

Change-Id: I1430e8788765d33e6fd03e2739676d26964cda68
2017-07-21 16:27:00 +00:00
Julia Reynolds
6ad9f3267b Zen settings screen update
am: 56b748d686

Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
2017-07-21 16:21:25 +00:00
Julia Reynolds
4faa353f02 Zen settings screen update
am: 56b748d686

Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686 Zen settings screen update
- Remove app attribution
- Change visual disturbances label

Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00
Android Build Merger (Role)
744bb1c4b1 Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98 am: bb86b53a06" into oc-mr1-dev-plus-aosp 2017-07-21 01:50:05 +00:00
Daniel Nishi
62fa0f8410 Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
am: bb86b53a06

Change-Id: I8fcb2b002c6007dafaeeee882a00937f4aa94e79
2017-07-21 01:49:39 +00:00
Daniel Nishi
eeae7822a2 Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
am: 0eae770acc

Change-Id: I0ae9bff7b69927d535656482838f1819304d82df
2017-07-21 01:49:34 +00:00