OSDN Git Service
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
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
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
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: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
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
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
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
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:23:56 +0000 (18:23 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am:
e09338a208
Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
Fan Zhang [Fri, 21 Jul 2017 18:18:44 +0000 (18:18 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
Doris Ling [Fri, 21 Jul 2017 17:29:34 +0000 (17:29 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev am:
a39daa25e7
am:
9275814c02
Change-Id: I3ef01527517f7660913b34621b7c74c1250d3361
Doris Ling [Fri, 21 Jul 2017 17:26:33 +0000 (17:26 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
am:
a39daa25e7
Change-Id: Iaf765d32f99018f2a6372e87523f8b83df97c584
Doris Ling [Fri, 21 Jul 2017 17:19:12 +0000 (17:19 +0000)]
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 16:30:39 +0000 (16:30 +0000)]
Merge "Zen settings screen update am:
56b748d686 am:
4faa353f02" into oc-mr1-dev-plus-aosp
am:
073e23286a
Change-Id: I116b395ee178ee550c7d02cc8c10b5a21b919f49
Julia Reynolds [Fri, 21 Jul 2017 16:30:18 +0000 (16:30 +0000)]
Zen settings screen update am:
56b748d686 am:
6ad9f3267b
am:
eff648bf76
Change-Id: Ic32cc6a1762b60b15e76762868a403e9f2b143d7
Android Build Merger (Role) [Fri, 21 Jul 2017 16:27:31 +0000 (16:27 +0000)]
Merge "Zen settings screen update am:
56b748d686 am:
4faa353f02" into oc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 21 Jul 2017 16:27:18 +0000 (16:27 +0000)]
Zen settings screen update am:
56b748d686
am:
4faa353f02
Change-Id: Ifd7d390db0373561b9a5536b412373579dadc8e3
Julia Reynolds [Fri, 21 Jul 2017 16:27:00 +0000 (16:27 +0000)]
Zen settings screen update am:
56b748d686
am:
6ad9f3267b
Change-Id: I1430e8788765d33e6fd03e2739676d26964cda68
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am:
56b748d686
Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
Julia Reynolds [Fri, 21 Jul 2017 16:21:25 +0000 (16:21 +0000)]
Zen settings screen update
am:
56b748d686
Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
Julia Reynolds [Fri, 21 Jul 2017 13:07:23 +0000 (09:07 -0400)]
Zen settings screen update
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes:
63905920
Fixes:
63906381
Test: manual
Daniel Nishi [Fri, 21 Jul 2017 01:52:12 +0000 (01:52 +0000)]
Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98 am:
bb86b53a06" into oc-mr1-dev-plus-aosp
am:
744bb1c4b1
Change-Id: I6e1a850bcbfb2e08ad5fbfa0c716cac477f5ddab
Daniel Nishi [Fri, 21 Jul 2017 01:51:38 +0000 (01:51 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98 am:
0eae770acc
am:
eeae7822a2
Change-Id: I53d3e3dc095ee9f40470caeec09a6d41cb2048de
Android Build Merger (Role) [Fri, 21 Jul 2017 01:50:05 +0000 (01:50 +0000)]
Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98 am:
bb86b53a06" into oc-mr1-dev-plus-aosp
Daniel Nishi [Fri, 21 Jul 2017 01:49:39 +0000 (01:49 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98
am:
bb86b53a06
Change-Id: I8fcb2b002c6007dafaeeee882a00937f4aa94e79
Daniel Nishi [Fri, 21 Jul 2017 01:49:34 +0000 (01:49 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev am:
4ab6f77f98
am:
0eae770acc
Change-Id: I0ae9bff7b69927d535656482838f1819304d82df
Daniel Nishi [Fri, 21 Jul 2017 01:47:17 +0000 (01:47 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
am:
4ab6f77f98
Change-Id: I17baf254839424d21f1588b1a7925927437b95c6
Daniel Nishi [Fri, 21 Jul 2017 01:47:17 +0000 (01:47 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
am:
4ab6f77f98
Change-Id: I06dea000a9bc74314905f49843262e79a6c240dd
TreeHugger Robot [Fri, 21 Jul 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Make the support loader activity display UI." into oc-dr1-dev
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically
Bug:
63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit
e651ddf9e6c00a62338ef8c7114b5e5e9cd307ec)
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
Fan Zhang [Fri, 21 Jul 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev am:
91468e309c
am:
2770bfa38b
Change-Id: I6c6ceb9d46e88bccc727334bd5a8cd373519b11c
Fan Zhang [Fri, 21 Jul 2017 00:41:32 +0000 (00:41 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
am:
91468e309c
Change-Id: Ib1dcebb2136f8a673e050a3d19534d3fdb309766
TreeHugger Robot [Fri, 21 Jul 2017 00:36:59 +0000 (00:36 +0000)]
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
Fan Zhang [Thu, 20 Jul 2017 22:31:24 +0000 (22:31 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev am:
52a3b5c17d
am:
8809d3f18e
Change-Id: I549c76f6670f92d63c7becb3284c95e97e9a386b
Fan Zhang [Thu, 20 Jul 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
am:
52a3b5c17d
Change-Id: I2127af952a134a9eeb17c2ee2eda6c8410a671f6
TreeHugger Robot [Thu, 20 Jul 2017 22:17:50 +0000 (22:17 +0000)]
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
Salvador Martinez [Thu, 20 Jul 2017 21:58:10 +0000 (21:58 +0000)]
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d am:
30b97e89d4" into oc-mr1-dev-plus-aosp
am:
280c7976e7
Change-Id: I4904a1db6b774acf447f1f1acd0f5c06b186c8cc
Salvador Martinez [Thu, 20 Jul 2017 21:57:49 +0000 (21:57 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d am:
2834bcb195
am:
c2649ba09d
Change-Id: Id7483570224dd0ecb9e62fe6f1cbcdba6e9dec52
Android Build Merger (Role) [Thu, 20 Jul 2017 21:56:06 +0000 (21:56 +0000)]
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d am:
30b97e89d4" into oc-mr1-dev-plus-aosp
Salvador Martinez [Thu, 20 Jul 2017 21:55:52 +0000 (21:55 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d
am:
30b97e89d4
Change-Id: I6a1d8d036380f183bb080330542f0d5090e93a1b
Salvador Martinez [Thu, 20 Jul 2017 21:55:48 +0000 (21:55 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am:
e4c9b7162d
am:
2834bcb195
Change-Id: I07ba4b0efeae47fc80c46a193aaf073ccadbc182
Salvador Martinez [Thu, 20 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am:
e4c9b7162d
Change-Id: Ib105c6a9769db260e781dde61af74563735345a3
Salvador Martinez [Thu, 20 Jul 2017 21:53:50 +0000 (21:53 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
am:
e4c9b7162d
Change-Id: I560c4f1640b20e781daf2bcc9e22fc0c9b511b90
Bill Yi [Thu, 20 Jul 2017 21:47:30 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours am:
2d50ad831e -s ours
am:
14ebe7a75d -s ours
Change-Id: Ia4cba51e8f08c5ff7e84756a4b920182835c2640
Bill Yi [Thu, 20 Jul 2017 21:47:10 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours am:
bc1a0265c5 -s ours
am:
34d159fca7 -s ours
Change-Id: I63a6c314846d2dcedd1cc1d8477c55aece9b3bc3
TreeHugger Robot [Thu, 20 Jul 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 21:41:58 +0000 (21:41 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304 am:
8ace0324ee
am:
e31cad3392
Change-Id: I206cef8dd9bc299bf455a7f1f425663ddadf5d05
Amit Mahajan [Thu, 20 Jul 2017 21:37:54 +0000 (21:37 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304 am:
9ded852f71
am:
4a88f93aac
Change-Id: Ie3a97abc571824ddbe24173a0e02293638befed1
Bill Yi [Thu, 20 Jul 2017 21:31:34 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours
am:
2d50ad831e -s ours
Change-Id: Ic02b25c0a6077217fbd8093ae4f55a062d62bb3f
Bill Yi [Thu, 20 Jul 2017 21:29:51 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours
am:
bc1a0265c5 -s ours
Change-Id: Ife685585ed0bef93f591de8b852dd4368811af42
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
acd97be0b8 -s ours
Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
acd97be0b8 -s ours
Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d
Amit Mahajan [Thu, 20 Jul 2017 21:26:51 +0000 (21:26 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304
am:
8ace0324ee
Change-Id: I515783259b3c57c36985e0646886a1248a47c608
Doris Ling [Thu, 20 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d am:
1f8c5debbb
am:
4d3a9f6f63
Change-Id: I4be042696570d0bd62e945a6f541677ea6dc5637
Evan Laird [Thu, 20 Jul 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004 am:
e99586cfea
am:
36d4a23727
Change-Id: I01a325cf480a98749eac987642eebdfb09e1cd71
Doris Ling [Thu, 20 Jul 2017 21:18:05 +0000 (21:18 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d am:
11cfc26d0a
am:
c7efdbdbf5
Change-Id: I9d1ed8ddc814387d767fd9ca653dde96865b2534
Evan Laird [Thu, 20 Jul 2017 21:17:47 +0000 (21:17 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004 am:
bc562b1888
am:
de5d2e8894
Change-Id: Ia40e778b74941bce7cda9e13643684c2eb96caa7
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 21:11:45 +0000 (21:11 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304
am:
9ded852f71
Change-Id: I1fc8aec7c8cfc71c707f4ea1d0f02a2a2a7c8375
TreeHugger Robot [Thu, 20 Jul 2017 21:08:37 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Amit Mahajan [Thu, 20 Jul 2017 21:00:23 +0000 (21:00 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: Ic352005843d3ffd0b04a0a80710c04a5f02291a6
Amit Mahajan [Thu, 20 Jul 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74
Doris Ling [Thu, 20 Jul 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d
am:
1f8c5debbb
Change-Id: If600090e0b5e49682411dc42c027a206c97e3e2c
Evan Laird [Thu, 20 Jul 2017 20:56:43 +0000 (20:56 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004
am:
e99586cfea
Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3
Doris Ling [Thu, 20 Jul 2017 20:51:19 +0000 (20:51 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d
am:
11cfc26d0a
Change-Id: I3ac60eea7ed915e891412f88479c9b5374f53299
Evan Laird [Thu, 20 Jul 2017 20:50:57 +0000 (20:50 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004
am:
bc562b1888
Change-Id: I9c33400aa612b7c44b9199ef8564889d8a128a1b
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Doris Ling [Thu, 20 Jul 2017 20:43:32 +0000 (20:43 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c
Evan Laird [Thu, 20 Jul 2017 20:42:46 +0000 (20:42 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I891ad549056df8632fd10570769c2695f6ad4384
Doris Ling [Thu, 20 Jul 2017 20:25:51 +0000 (13:25 -0700)]
Fix gesture preview image visibility not set correctly.
- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.
Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix:
63783217
Test: make RunSettingsRoboTests
Doris Ling [Thu, 20 Jul 2017 20:38:09 +0000 (20:38 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: I4b6b6f8d2d6ef19e16d74df1f403f0a5f5109713
Evan Laird [Thu, 20 Jul 2017 20:37:47 +0000 (20:37 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I596d700d10a29640344d4554824a29eb21e71cf1
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
Fan Zhang [Wed, 19 Jul 2017 23:44:28 +0000 (16:44 -0700)]
Add shadow to searchbar when user scrolls vertically
Bug:
63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 20:16:26 +0000 (20:16 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp am:
8746483a7c -s ours" into oc-mr1-dev-plus-aosp
am:
6c3edcd118 -s ours
Change-Id: I9473a5de7493dd65fb6c4cefa0dbe56c1c20ae06
Bill Yi [Thu, 20 Jul 2017 20:16:02 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
bd3bd7d1e1 -s ours am:
29978d1ee6 -s ours" into oc-mr1-dev-plus-aosp
am:
2929aa2069 -s ours
Change-Id: I21e677aa73df3a150f46bed015f61592c71be348
Bill Yi [Thu, 20 Jul 2017 20:15:42 +0000 (20:15 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours am:
821967eca5 -s ours
am:
b840846416 -s ours
Change-Id: If2f2bb43dcc0c9215ae7c20a362742fdf9f4e607
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:56 +0000 (20:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp am:
8746483a7c -s ours" into oc-mr1-dev-plus-aosp
OSDN Git Service
