Commit Graph

37560 Commits

Author SHA1 Message Date
Andrew Sapperstein
cc7adfd9e0 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am: 63c63ff640
am: 301dfdd8d1

Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5
2017-06-29 04:52:32 +00:00
Andrew Sapperstein
301dfdd8d1 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
am: 63c63ff640

Change-Id: I165409df28685c85ca2edc22971e4471d9ff549f
2017-06-29 04:48:30 +00:00
TreeHugger Robot
63c63ff640 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev 2017-06-29 04:38:44 +00:00
Maurice Lam
21bd3994c4 Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7
am: d3d1210fad

Change-Id: I6f689b5242b122eb2f4388de10acb7e4c7e3b81e
2017-06-29 02:07:19 +00:00
Maurice Lam
d3d1210fad Merge "Read theme for lock screen flows" into oc-dr1-dev
am: 864d5c96d7

Change-Id: I5b70f7ac6ff0c4598f3f409d682c9ff2dec42471
2017-06-29 02:00:33 +00:00
TreeHugger Robot
4ef813efdc Merge "Disable SmartSuggestion conditionally" 2017-06-29 01:55:52 +00:00
Maurice Lam
864d5c96d7 Merge "Read theme for lock screen flows" into oc-dr1-dev 2017-06-29 01:47:14 +00:00
jackqdyulei
0e852e4113 Merge "Add metric action log for anomaly action" into oc-dr1-dev am: 43afb664e6
am: b58333f46e

Change-Id: If798eac93947126cbdee7c02ee69a792d3032d18
2017-06-29 01:19:16 +00:00
jackqdyulei
b58333f46e Merge "Add metric action log for anomaly action" into oc-dr1-dev
am: 43afb664e6

Change-Id: I8cd38faa751b9fabbe9164d90b0e73199b28bf94
2017-06-29 01:15:33 +00:00
Doris Ling
bcd2322fa6 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9
am: 5d66fa4c94  -s ours

Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb
2017-06-29 01:15:23 +00:00
Doris Ling
5d66fa4c94 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
am: 9df70249b9

Change-Id: I4d245fa2b74d5e6967a522455584971b8c9fb711
2017-06-29 01:11:57 +00:00
TreeHugger Robot
2d6930b2df Merge "Add account sync summary." 2017-06-29 01:11:43 +00:00
TreeHugger Robot
43afb664e6 Merge "Add metric action log for anomaly action" into oc-dr1-dev 2017-06-29 01:10:42 +00:00
TreeHugger Robot
9df70249b9 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev 2017-06-29 01:04:58 +00:00
jackqdyulei
985aa11e1a Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 33c9b7a111
am: 9d57855c96

Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
2017-06-29 00:53:14 +00:00
jackqdyulei
9d57855c96 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am: 33c9b7a111

Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
2017-06-29 00:48:47 +00:00
TreeHugger Robot
33c9b7a111 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev 2017-06-29 00:43:09 +00:00
Andrew Sapperstein
ebaab6aabd Reduce number of wallpaper results in search.
Previously we indexed the intent in display settings and every
app that handled ACTION_SET_WALLPAPER. Now, we only index an
app that handles ACTION_SET_WALLPAPER and is the listed package in
config_wallpaper_picker_package.

Change-Id: Ife81702017e3e8be4a754873d9c453fddf1cbd9e
Fixes: 62793068
Test: manual, search wallpaper and observe results
2017-06-28 17:16:57 -07:00
Sundeep Ghuman
77a58c7b8c Merge "Scroll to top when connecting to network." into oc-dr1-dev am: ea3d314a10
am: 9ff2435ebc

Change-Id: Ia9041ca6f1a3fcfc707b9e3f93a06a1612226606
2017-06-28 23:40:33 +00:00
Sundeep Ghuman
9ff2435ebc Merge "Scroll to top when connecting to network." into oc-dr1-dev
am: ea3d314a10

Change-Id: I78adb370cf5261611ad0a56effae652c494e9592
2017-06-28 23:36:12 +00:00
TreeHugger Robot
ea3d314a10 Merge "Scroll to top when connecting to network." into oc-dr1-dev 2017-06-28 23:32:13 +00:00
jackqdyulei
ac29684b14 Add metric action log for anomaly action
Change AnomalyAction to abstract class and log the action there.

Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
2017-06-28 15:35:54 -07:00
Maurice Lam
9990f39722 Read theme for lock screen flows
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.

Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
2017-06-28 15:06:09 -07:00
Fan Zhang
e199f50d65 Disable SmartSuggestion conditionally
The smart suggestion flag should be treated as false when dismissing
first impression type suggestions. Smart suggestion and first impression
suggestions have different dismiss rules.

Change-Id: Ia99d310ddea7baf58b6eadacee8ccda5bf33f311
Fix: 63094854
Test: robotests
2017-06-28 14:58:29 -07:00
TreeHugger Robot
b0eaab5738 Merge "Fix preference title typo in saved network screen" 2017-06-28 21:24:55 +00:00
Daniel Nishi
65a628751e Merge "Put the donut on a diet." into oc-dr1-dev am: 2cbe278ad4
am: 7cc286bac7

Change-Id: I7ff03385d589e1fd147f05cd417fbaba144a3e3c
2017-06-28 21:07:26 +00:00
Daniel Nishi
696afbc1cb Merge "Use the proper style for the SpacePreference." into oc-dr1-dev am: ff8312b36b
am: e440fdb769

Change-Id: I2b393b0583f295524eaaa79032f73abc0724469d
2017-06-28 21:07:00 +00:00
Daniel Nishi
7cc286bac7 Merge "Put the donut on a diet." into oc-dr1-dev
am: 2cbe278ad4

Change-Id: I156d0acacd4933247634d7915defa9fbe73a0ba0
2017-06-28 20:59:52 +00:00
Daniel Nishi
e440fdb769 Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
am: ff8312b36b

Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
2017-06-28 20:59:31 +00:00
Daniel Nishi
2cbe278ad4 Merge "Put the donut on a diet." into oc-dr1-dev 2017-06-28 20:54:57 +00:00
Daniel Nishi
ff8312b36b Merge "Use the proper style for the SpacePreference." into oc-dr1-dev 2017-06-28 20:54:29 +00:00
Matthew Fritze
f050ab93d1 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev am: e2e54e17c7
am: d4075ea983

Change-Id: Ie93718a9af3b3bb4e53dfbf7f43da31c1ee9404a
2017-06-28 20:53:12 +00:00
Matthew Fritze
d4075ea983 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
am: e2e54e17c7

Change-Id: Ib8b6696cc232ef492a75180c4ac18ee7685be047
2017-06-28 20:50:22 +00:00
TreeHugger Robot
e2e54e17c7 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev 2017-06-28 20:44:13 +00:00
Matthew Fritze
5c16030dbc Merge "Add list-select as an inline result" into oc-dr1-dev am: e455c8f377
am: 46483a1a29

Change-Id: Ia2f55440571504c66b67276990e9fde19a1709fa
2017-06-28 20:40:42 +00:00
Matthew Fritze
46483a1a29 Merge "Add list-select as an inline result" into oc-dr1-dev
am: e455c8f377

Change-Id: I2b1e27042120dcb8121565ff58c21de0077837f3
2017-06-28 20:33:36 +00:00
TreeHugger Robot
84872626cd Merge "Change to use new suggestion/condition UI." 2017-06-28 20:27:27 +00:00
TreeHugger Robot
e455c8f377 Merge "Add list-select as an inline result" into oc-dr1-dev 2017-06-28 20:27:00 +00:00
Doris Ling
771848dde0 Add account sync summary.
- Check for the number of sync adapter that is enabled for the account
and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.

Bug: 62862167
Test: make RunSettingsRoboTests
Change-Id: Ic333f62cce9aed0a72771324976ebe3d8e586287
2017-06-28 13:18:56 -07:00
jackqdyulei
f43f359242 Merge "Hide the IDLE in "app list"" into oc-dr1-dev am: 9a30ceab83
am: 881b581e0a

Change-Id: I1a63208cc637be0f9f5ab1e4171b59e498d381ee
2017-06-28 19:48:46 +00:00
jackqdyulei
f1d0308ae7 Merge "Update the UI for battery header" into oc-dr1-dev am: 923f50fce6
am: 9d4a2806a8

Change-Id: I28f110fef49db0aca036eb06c5c3f4d1249522de
2017-06-28 19:48:24 +00:00
jackqdyulei
881b581e0a Merge "Hide the IDLE in "app list"" into oc-dr1-dev
am: 9a30ceab83

Change-Id: I3e1b14434ae00357f0193bb917469319a212b155
2017-06-28 19:45:17 +00:00
jackqdyulei
9d4a2806a8 Merge "Update the UI for battery header" into oc-dr1-dev
am: 923f50fce6

Change-Id: Iee54c0fa4ff744ecadefe8fa75e069920569cb9e
2017-06-28 19:44:55 +00:00
TreeHugger Robot
9a30ceab83 Merge "Hide the IDLE in "app list"" into oc-dr1-dev 2017-06-28 19:38:20 +00:00
TreeHugger Robot
923f50fce6 Merge "Update the UI for battery header" into oc-dr1-dev 2017-06-28 19:37:40 +00:00
jackqdyulei
85e25e34fd Fix the getForegroundActivityTotalTimeMs
The parameter in timer should be microseconds, not milliseconds

Bug: 63073847
Test: RunSettingsRoboTests
Change-Id: I5e451aee9eb30815fbefe12c0bfdc85dff884b8e
2017-06-28 12:33:20 -07:00
Doris Ling
b99af0e4a2 Change to use new suggestion/condition UI.
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.

Fix: 37645754
Fix: 62621808
Test: make RunSettingsRoboTests

Merged-In: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Change-Id: I5ef169a563166520dad0ac44f6780da814e2f1f7
2017-06-28 12:22:34 -07:00
Fan Zhang
79d8fbb789 Fix preference title typo in saved network screen
Change-Id: If6df7d42379d8597fcdcd20f71c88376a972ee70
Fix: 33909403
Test: reindex search
2017-06-28 12:17:43 -07:00
Matthew Fritze
98a9e42c93 Add synchronous indexing api to SearchFeatureProvider
- Opens the database indexing to be synchronous for the
external settings api.
- Adds logging to track synchronous and async indexing
times.

Bug: 62826872
Test: make RunSettingsRoboTests
Change-Id: I28b69f3952946c0ae5dd7ea7da66f7a5fd485637
2017-06-28 11:31:27 -07:00
Daniel Nishi
e55bffaf59 Put the donut on a diet.
Shrinks the donut from 6dp to 4dp to closer match the mocks.

Change-Id: Iaf455beb4f54e7673ff6adc6068e0410fac379b5
Fixes: 62548749
Test: Manual
2017-06-28 18:29:40 +00:00