OSDN Git Service
Lei Yu [Mon, 24 Jul 2017 18:23:05 +0000 (18:23 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev am:
6666bf5605 am:
0f9fa63c3a
am:
d98275c7dc
Change-Id: I2f619171a42aca61f1d8e913005f9f0d44095118
Lei Yu [Mon, 24 Jul 2017 18:14:13 +0000 (18:14 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev am:
6666bf5605
am:
0f9fa63c3a
Change-Id: Ibb11b891799815a3ec2f8c8961b197ffadeaf9db
Lei Yu [Mon, 24 Jul 2017 18:07:13 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am:
6666bf5605
Change-Id: I7ca4b466c6f175192bebb2b9a7807ebf783a249e
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
Andrew Sapperstein [Mon, 24 Jul 2017 17:48:49 +0000 (17:48 +0000)]
Merge "Add ResultPayload for always-on ambient display. am:
eb1a45b95b am:
cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
am:
867ee49254 -s ours
Change-Id: Ibb7dee38be7424883002939aae5fe6f3c3d17ff4
Andrew Sapperstein [Mon, 24 Jul 2017 17:48:27 +0000 (17:48 +0000)]
Add ResultPayload for always-on ambient display. am:
eb1a45b95b -s ours am:
8389d669f1 -s ours
am:
7b2efcace8 -s ours
Change-Id: Ibff0c7e61d966f668f79d2eb16232d47c02a9549
Android Build Merger (Role) [Mon, 24 Jul 2017 17:42:01 +0000 (17:42 +0000)]
Merge "Add ResultPayload for always-on ambient display. am:
eb1a45b95b am:
cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
Andrew Sapperstein [Mon, 24 Jul 2017 17:41:47 +0000 (17:41 +0000)]
Add ResultPayload for always-on ambient display. am:
eb1a45b95b
am:
cfb2b87d03 -s ours
Change-Id: I56bad70b1614cf80c4bb24695902c4fc5fa5dc53
Andrew Sapperstein [Mon, 24 Jul 2017 17:41:42 +0000 (17:41 +0000)]
Add ResultPayload for always-on ambient display. am:
eb1a45b95b -s ours
am:
8389d669f1 -s ours
Change-Id: I7d0778edd726966a4e68398b5c14a6144d1ee4af
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:10 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b
Change-Id: Ie00201adc19b7da516e3bb64fe857a17f8282d28
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:06 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am:
eb1a45b95b -s ours
Change-Id: I67522a734dff97d37f09751817f99e5f8a6bf602
Andrew Sapperstein [Mon, 24 Jul 2017 17:22:08 +0000 (17:22 +0000)]
Add ResultPayload for always-on ambient display. am:
36af00bb21
am:
e77497ce6a
Change-Id: I7690018fb294fddf0322f6eed061e1e3e71683c6
Andrew Sapperstein [Mon, 24 Jul 2017 17:08:17 +0000 (17:08 +0000)]
Add ResultPayload for always-on ambient display.
am:
36af00bb21
Change-Id: I4b451605cee675c5949aeb68be27588502ded0d0
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.
Bug:
62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
Fan Zhang [Sat, 22 Jul 2017 18:06:33 +0000 (18:06 +0000)]
Merge "Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c -s ours am:
6cd295af8a -s ours" into oc-mr1-dev-plus-aosp
am:
34e1495b9a -s ours
Change-Id: I1e8ff08dbdce2eaa450d04e1dc571ae5578bd1d5
Fan Zhang [Sat, 22 Jul 2017 18:06:09 +0000 (18:06 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c am:
2c7b00d101 -s ours
am:
4bcaef7b0c -s ours
Change-Id: I5a834f28cc5909d1f451ceb295e8c4921f2ae2c7
Android Build Merger (Role) [Sat, 22 Jul 2017 18:03:23 +0000 (18:03 +0000)]
Merge "Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c -s ours am:
6cd295af8a -s ours" into oc-mr1-dev-plus-aosp
Fan Zhang [Sat, 22 Jul 2017 18:03:07 +0000 (18:03 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c -s ours
am:
6cd295af8a -s ours
Change-Id: Ib310943f7b0dae93714b01d19cdf08f14b8eeb8e
Fan Zhang [Sat, 22 Jul 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am:
6fcc38975c
am:
2c7b00d101 -s ours
Change-Id: Iaa1c8ef7686c8842becf494d210b08aed097fb50
Fan Zhang [Sat, 22 Jul 2017 17:59:38 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c
Change-Id: Iacb3b689d1099bb12e43ff42e2f17166428ddfc5
Fan Zhang [Sat, 22 Jul 2017 17:59:36 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am:
6fcc38975c -s ours
Change-Id: I8ab95d4753c9369a4d47c83ade83380d26733b46
TreeHugger Robot [Sat, 22 Jul 2017 17:54:31 +0000 (17:54 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:47:52 +0000 (16:47 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours am:
ccf6996623 -s ours" into oc-mr1-dev-plus-aosp
am:
47099cf173 -s ours
Change-Id: I70e2aea1799d8b38baa3a50818ac883b6bf37398
Bill Yi [Sat, 22 Jul 2017 16:47:28 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours am:
098c04e781 -s ours
am:
eca137aa43 -s ours
Change-Id: Ice5b7d4cacd9b6179e1d60dc3a52a4e3798d0679
Android Build Merger (Role) [Sat, 22 Jul 2017 16:38:48 +0000 (16:38 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours am:
ccf6996623 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sat, 22 Jul 2017 16:38:29 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours
am:
098c04e781 -s ours
Change-Id: Ie43f65cae3a7422bfbb0d95281e30489f1c36365
Bill Yi [Sat, 22 Jul 2017 16:38:28 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4d7111b0e9 -s ours
am:
ccf6996623 -s ours
Change-Id: I61ebe83e46f7dcaf8ffe3eddc817858c48695b38
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ia23869b823b5f9f578eea955f037393960bb02e0
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4d7111b0e9 -s ours
Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29
TreeHugger Robot [Sat, 22 Jul 2017 16:25:35 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:13:53 +0000 (16:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 22 Jul 2017 10:57:25 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 10:36:18 +0000 (03:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I72ad5b5a671392c519f7a4ca5fce76404c2240b5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Sat, 22 Jul 2017 02:23:48 +0000 (02:23 +0000)]
Merge "Post preference update logic to main thread"
Andrew Sapperstein [Sat, 22 Jul 2017 00:44:28 +0000 (00:44 +0000)]
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
am:
cdb44fee84
Change-Id: Ide1c6b5a25a0e9d891322097988e742afbab7d47
Fan Zhang [Sat, 22 Jul 2017 00:44:07 +0000 (00:44 +0000)]
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24 am:
3ecdee573b" into oc-mr1-dev-plus-aosp
am:
b0431ad1ca
Change-Id: If8ce75c2b5afe786fd23ddcc66d21af188f20391
Lei Yu [Sat, 22 Jul 2017 00:43:47 +0000 (00:43 +0000)]
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626 am:
ab7a4db9df" into oc-mr1-dev-plus-aosp
am:
1ef1ea17b2
Change-Id: Icd3bdfcf117f4417bb3ef0cf631bace884231d38
Antony Sargent [Sat, 22 Jul 2017 00:43:28 +0000 (00:43 +0000)]
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
am:
465871284e
Change-Id: I45942af6b255c5d737058358493783eec48cf48e
Andrew Sapperstein [Sat, 22 Jul 2017 00:42:57 +0000 (00:42 +0000)]
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
am:
3c6df33d4b
Change-Id: I6768483e56d60effb2127720a39e36034716514d
Christine Franks [Sat, 22 Jul 2017 00:42:31 +0000 (00:42 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am:
cb9a7075f8 -s ours am:
18cd618368
am:
e147a19773
Change-Id: I14470dfb8a49a412a7ec3b06136b2c4cb97d2345
Fan Zhang [Sat, 22 Jul 2017 00:42:13 +0000 (00:42 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24 am:
ef0e290e65
am:
715f0956f4
Change-Id: I0fde0822693cffe0cf8f62296e8e14dde4fb84cf
Lei Yu [Sat, 22 Jul 2017 00:41:54 +0000 (00:41 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626 am:
454131cdb0
am:
c857c195cf
Change-Id: I50a779fb43d72f15463d8eeced598922d22c37e3
Antony Sargent [Sat, 22 Jul 2017 00:41:38 +0000 (00:41 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am:
a6ac4890ed am:
62b7527da5
am:
75512a3215
Change-Id: I8d5d76660f90ae614eaa420d0072f2a6024a50d7
Christine Franks [Sat, 22 Jul 2017 00:41:22 +0000 (00:41 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am:
cb9a7075f8 am:
c350386476 -s ours
am:
c2bd97a5df
Change-Id: I0a3e1f1d9dcca852e1db83a92e2b5884dea02901
Android Build Merger (Role) [Sat, 22 Jul 2017 00:38:00 +0000 (00:38 +0000)]
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
Andrew Sapperstein [Sat, 22 Jul 2017 00:37:40 +0000 (00:37 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am:
59a66d9b77
am:
ebd8308698
Change-Id: I5bcbe810c82c2a71a8cd8ff8f9ab5a6f4a6015e7
Android Build Merger (Role) [Sat, 22 Jul 2017 00:37:19 +0000 (00:37 +0000)]
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24 am:
3ecdee573b" into oc-mr1-dev-plus-aosp
Fan Zhang [Sat, 22 Jul 2017 00:37:06 +0000 (00:37 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24
am:
3ecdee573b
Change-Id: Iceb537582606cca48f50de701232c8c868cc523c
Android Build Merger (Role) [Sat, 22 Jul 2017 00:37:00 +0000 (00:37 +0000)]
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626 am:
ab7a4db9df" into oc-mr1-dev-plus-aosp
Lei Yu [Sat, 22 Jul 2017 00:36:48 +0000 (00:36 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626
am:
ab7a4db9df
Change-Id: Ic8abdff3468d1670533fe7bc99915fe3132c44ee
Android Build Merger (Role) [Sat, 22 Jul 2017 00:36:43 +0000 (00:36 +0000)]
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
Antony Sargent [Sat, 22 Jul 2017 00:36:30 +0000 (00:36 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am:
a6ac4890ed
am:
0531bd48e3
Change-Id: I0c7931f70db596cce9ddeb91d2bbdc3fc2a99aeb
Android Build Merger (Role) [Sat, 22 Jul 2017 00:36:29 +0000 (00:36 +0000)]
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
Christine Franks [Sat, 22 Jul 2017 00:36:07 +0000 (00:36 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am:
cb9a7075f8 -s ours
am:
18cd618368
Change-Id: Ia4986adc50cca19ca72e2e036cd7bef78006bbaf
Andrew Sapperstein [Sat, 22 Jul 2017 00:36:03 +0000 (00:36 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am:
59a66d9b77
am:
80a5336b25
Change-Id: Ib32bcfa22706abf89633b86333498f77328daebb
Andrew Sapperstein [Sat, 22 Jul 2017 00:33:13 +0000 (00:33 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I2b279d3a1562e693caeaf64f2f91ab629b4e294f
Fan Zhang [Sat, 22 Jul 2017 00:32:48 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev am:
03c595ce24
am:
ef0e290e65
Change-Id: I77ca5052477a9e1efee01c7022378164096669b8
Fan Zhang [Sat, 22 Jul 2017 00:32:42 +0000 (00:32 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am:
03c595ce24
Change-Id: I1d2f8d65fb7ba48bac656222c4501306103b385c
Andrew Sapperstein [Sat, 22 Jul 2017 00:32:32 +0000 (00:32 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am:
59a66d9b77
Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
Christine Franks [Sat, 22 Jul 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev am:
fd8b8eb0b1
am:
8061500847
Change-Id: I76248c968334e04f9b878f184f60596cf5750a68
Lei Yu [Sat, 22 Jul 2017 00:32:27 +0000 (00:32 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev am:
0ec3e4e626
am:
454131cdb0
Change-Id: I3feacbe94bca351809341e60464a6834e6980a12
Lei Yu [Sat, 22 Jul 2017 00:32:21 +0000 (00:32 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am:
0ec3e4e626
Change-Id: Ie3e4b7ead145b22c44383443229043722b9e86d9
Antony Sargent [Sat, 22 Jul 2017 00:32:07 +0000 (00:32 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am:
a6ac4890ed
am:
62b7527da5
Change-Id: Ibfe8afab3bf662c2855a28c27d636da17444eb79
Antony Sargent [Sat, 22 Jul 2017 00:32:00 +0000 (00:32 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am:
a6ac4890ed
Change-Id: Ib4cbffa94b0372419f60f16972836df27ad1fecf
Christine Franks [Sat, 22 Jul 2017 00:31:48 +0000 (00:31 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am:
cb9a7075f8
am:
c350386476 -s ours
Change-Id: I6371e6575ba1b60dfe1c715c46e17be4f6340d98
Christine Franks [Sat, 22 Jul 2017 00:31:39 +0000 (00:31 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am:
cb9a7075f8 -s ours
Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663
TreeHugger Robot [Sat, 22 Jul 2017 00:28:31 +0000 (00:28 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
Christine Franks [Sat, 22 Jul 2017 00:11:01 +0000 (00:11 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
am:
fd8b8eb0b1
Change-Id: I2f22b732d4268af4ce2fd537746287bda8091e70
Fan Zhang [Sat, 22 Jul 2017 00:01:00 +0000 (17:01 -0700)]
Post preference update logic to main thread
Change-Id: Ic1e1f64446a9aec9da7dce3fd23ae4ba17b25b28
Fix:
36131513
Test: robotests in the same topic
Christine Franks [Fri, 21 Jul 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 23:49:37 +0000 (23:49 +0000)]
Merge "Layout tweak for app action buttons"
Bill Yi [Fri, 21 Jul 2017 22:22:55 +0000 (22:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
f364c30330 -s ours
am:
1c6e27b4d5 -s ours
Change-Id: Ic27d3670df76b1543e128c7f3eefd9f606b7ae56
Bill Yi [Fri, 21 Jul 2017 22:20:24 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f364c30330 -s ours
Change-Id: I9aa60965b808aadc652caf17b9e7f46e639c12a7
Fan Zhang [Fri, 21 Jul 2017 22:18:24 +0000 (22:18 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev am:
85287ec26a
am:
ea0e71ccc7
Change-Id: Idbaa2e898064d7d24f2f36ca05be02a17e734d86
TreeHugger Robot [Fri, 21 Jul 2017 22:16:56 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Fan Zhang [Fri, 21 Jul 2017 22:15:54 +0000 (22:15 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
am:
85287ec26a
Change-Id: Ieffd7131081d33db12437f0407d347eaec76c7f2
TreeHugger Robot [Fri, 21 Jul 2017 22:09:15 +0000 (22:09 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-mr1-dev
Fan Zhang [Fri, 21 Jul 2017 22:06:36 +0000 (15:06 -0700)]
Layout tweak for app action buttons
Now shadow is no longer cropped when pressing button
Change-Id: I6ac8588abb75ca23912f62808a57e8402857e18b
Fixes:
62550425
Test: visual
Andrew Sapperstein [Fri, 21 Jul 2017 22:01:55 +0000 (15:01 -0700)]
Add help uri for process stats summary and apps.
Bug:
62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
Fan Zhang [Fri, 21 Jul 2017 21:47:13 +0000 (21:47 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
am:
03c595ce24
Change-Id: I25e7a3c66fddb8b594e06ced3435fa02273dc68e
Fan Zhang [Fri, 21 Jul 2017 21:41:29 +0000 (21:41 +0000)]
Merge "Tweak bluetooth name preference" into oc-dr1-dev
Lei Yu [Fri, 21 Jul 2017 20:30:18 +0000 (20:30 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
am:
0ec3e4e626
Change-Id: Idcd210c8643f4e60375ab957bcc83136e5ffb0f3
Lei Yu [Fri, 21 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Make anomaly item refresh in battery" into oc-dr1-dev
Antony Sargent [Fri, 21 Jul 2017 20:11:53 +0000 (20:11 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am:
a6ac4890ed
Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
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
TreeHugger Robot [Fri, 21 Jul 2017 20:03:41 +0000 (20:03 +0000)]
Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 19:42:34 +0000 (19:42 +0000)]
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
am:
f5bb4e9a8a
Change-Id: Ieb317539cdc6a33114ed14789b0da01c21a18923
Fan Zhang [Fri, 21 Jul 2017 19:42:11 +0000 (19:42 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am:
e09338a208 am:
8df2cef10d -s ours
am:
a5124c9dcf
Change-Id: Ic75719d180331adb59586d58829d7f8040e125dc
jackqdyulei [Tue, 18 Jul 2017 18:02:53 +0000 (11:02 -0700)]
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
Fan Zhang [Fri, 21 Jul 2017 00:05:01 +0000 (17:05 -0700)]
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
Bill Yi [Fri, 21 Jul 2017 19:22:06 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb876a3208315c84fad355fac5204336eb8681e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christine Franks [Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)]
Move logic for FR in demo mode out of Settings
Bug:
62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
Christine Franks [Fri, 21 Jul 2017 19:05:42 +0000 (19:05 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
am:
cb9a7075f8
Change-Id: I0b059d3c240169ff4b0cc24fd22597bd31659fe7
Christine Franks [Fri, 21 Jul 2017 18:52:56 +0000 (18:52 +0000)]
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev
Android Build Merger (Role) [Fri, 21 Jul 2017 18:51:46 +0000 (18:51 +0000)]
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
Fan Zhang [Fri, 21 Jul 2017 18:51:19 +0000 (18:51 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am:
e09338a208 -s ours
am:
50ac1cebc3
Change-Id: Ie6554b2f6ca85e9805b40582d0a6f058aa0abc4e
Fan Zhang [Fri, 21 Jul 2017 18:51:14 +0000 (18:51 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev am:
e09338a208
am:
8df2cef10d -s ours
Change-Id: I3156fe7bfd6f2383b18457cf4a854059c26b6f0a
Fan Zhang [Fri, 21 Jul 2017 18:42:40 +0000 (18:42 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am:
e09338a208 -s ours
Change-Id: Iabafe1e7ffdd70fa9694cf4e293d83b4aef6bba8
Fan Zhang [Fri, 21 Jul 2017 18:34:39 +0000 (11:34 -0700)]
Tweak bluetooth name preference
- remove accent color from device name
- remove useless ripple when tap
Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix:
62891178
Test: robotests
OSDN Git Service
