Christine Franks
c2bd97a5df
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
...
am: c350386476
2017-07-22 00:31:48 +00:00
Christine Franks
8061500847
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
...
am: fd8b8eb0b1
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
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
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
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
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
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
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
2017-07-21 18:42:40 +00:00
Fan Zhang
8df2cef10d
Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
...
am: e09338a208
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
Doris Ling
9275814c02
Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev
...
am: a39daa25e7
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
2017-07-21 16:27:18 +00:00
Julia Reynolds
eff648bf76
Zen settings screen update am: 56b748d686
...
am: 6ad9f3267b
2017-07-21 16:27:00 +00:00
Julia Reynolds
6ad9f3267b
Zen settings screen update
...
am: 56b748d686
2017-07-21 16:21:25 +00:00
Julia Reynolds
4faa353f02
Zen settings screen update
...
am: 56b748d686
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
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
2017-07-21 01:49:34 +00:00
Daniel Nishi
bb86b53a06
Merge "Make the support loader activity display UI." into oc-dr1-dev
...
am: 4ab6f77f98
2017-07-21 01:47:17 +00:00
Daniel Nishi
0eae770acc
Merge "Make the support loader activity display UI." into oc-dr1-dev
...
am: 4ab6f77f98
2017-07-21 01:47:17 +00:00
TreeHugger Robot
4ab6f77f98
Merge "Make the support loader activity display UI." into oc-dr1-dev
2017-07-21 01:43:47 +00:00
Fan Zhang
ee8d574c26
Add shadow to searchbar when user scrolls vertically
...
Bug: 63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6
2017-07-21 01:34:46 +00:00
Christine Franks
a09eb383d9
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-20 17:44:18 -07:00
Fan Zhang
2770bfa38b
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
...
am: 91468e309c
2017-07-21 00:41:32 +00:00
TreeHugger Robot
91468e309c
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
2017-07-21 00:36:59 +00:00
Fan Zhang
8809d3f18e
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
...
am: 52a3b5c17d
2017-07-20 22:23:54 +00:00
TreeHugger Robot
52a3b5c17d
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
2017-07-20 22:17:50 +00:00
Android Build Merger (Role)
280c7976e7
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d am: 30b97e89d4" into oc-mr1-dev-plus-aosp
2017-07-20 21:56:06 +00:00
Salvador Martinez
c27c831b1b
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
...
am: 30b97e89d4
2017-07-20 21:55:52 +00:00
Salvador Martinez
c2649ba09d
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
...
am: 2834bcb195
2017-07-20 21:55:48 +00:00
Salvador Martinez
30b97e89d4
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
...
am: e4c9b7162d
2017-07-20 21:53:50 +00:00
Salvador Martinez
2834bcb195
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
...
am: e4c9b7162d
2017-07-20 21:53:50 +00:00
TreeHugger Robot
e4c9b7162d
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
2017-07-20 21:46:33 +00:00
Bill Yi
14ebe7a75d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
...
am: 2d50ad831e
2017-07-20 21:31:34 +00:00
Bill Yi
34d159fca7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
...
am: bc1a0265c5
2017-07-20 21:29:51 +00:00
Bill Yi
2d50ad831e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: acd97be0b8
2017-07-20 21:27:48 +00:00
Bill Yi
bc1a0265c5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: acd97be0b8
2017-07-20 21:27:48 +00:00
Amit Mahajan
e31cad3392
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304
...
am: 8ace0324ee
2017-07-20 21:26:51 +00:00
TreeHugger Robot
acd97be0b8
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-20 21:17:34 +00:00
