Commit Graph

38441 Commits

Author SHA1 Message Date
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
Doris Ling
e76550a66e 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.

Merged-In: Ic333f62cce9aed0a72771324976ebe3d8e586287
Change-Id: I003d6dd0a070bf123f178b8d9ba7b6657466b905
Fix: 62862167
Test: make RunSettingsRoboTests
2017-06-28 13:37:17 -07: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
Doris Ling
631893f582 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.

Bug: 37645754
Bug: 62621808
Test: make RunSettingsRoboTests
Change-Id: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
2017-06-28 11:22:44 -07:00
Matthew Fritze
694088075e Add list-select as an inline result
Move the majority of the Setting set & get logic into
InlinePayload, but add formatting of input to each
concrete payload class.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I08932871554beb4a04625f05f8555a5b3a887fe2
2017-06-28 11:21:55 -07:00
Lei Yu
db62b52119 Merge "Add location check action for bt anomaly" into oc-dr1-dev am: a6b24388fc
am: 91dbfc6ee9

Change-Id: Ib7f5560b4ef44cb14bcf5e3633b09d179816b221
2017-06-28 18:13:20 +00:00
Lei Yu
91dbfc6ee9 Merge "Add location check action for bt anomaly" into oc-dr1-dev
am: a6b24388fc

Change-Id: I2f1e1b65a5d7583ff76d77d3923df5ad7e1e652e
2017-06-28 18:05:34 +00:00
jackqdyulei
c67694686f Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am: d6df3b3d00
am: cbdaa2b56a

Change-Id: I1c260f3d1d089ae46ddba08dfc83063085ecbe42
2017-06-28 18:01:17 +00:00
jackqdyulei
cbdaa2b56a Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev
am: d6df3b3d00

Change-Id: I3ca5d821c33860f35d7fd37c0ddb92516095d099
2017-06-28 17:57:48 +00:00
Lei Yu
95a0bd4ca2 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 451b7edfd7
am: d3f035af0a

Change-Id: If1a3d3b931130efa18014538bc95c2d9ac41d410
2017-06-28 17:57:46 +00:00
Lei Yu
a6b24388fc Merge "Add location check action for bt anomaly" into oc-dr1-dev 2017-06-28 17:54:59 +00:00
Lei Yu
d3f035af0a Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am: 451b7edfd7

Change-Id: I609e926c481e991d4039e42d0872ebcfd218679b
2017-06-28 17:54:20 +00:00
TreeHugger Robot
d6df3b3d00 Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev 2017-06-28 17:53:30 +00:00
Lei Yu
451b7edfd7 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev 2017-06-28 17:49:36 +00:00
Fan Zhang
8072ff4220 Merge "Update string: Gesture setting title" into oc-dr1-dev am: b365594242
am: 1d16eb3622

Change-Id: I08b48e4e3c6049ddb9e25a3733b7f19b012bb051
2017-06-28 17:47:45 +00:00
Fan Zhang
1d16eb3622 Merge "Update string: Gesture setting title" into oc-dr1-dev
am: b365594242

Change-Id: I86d464edb6c4cf00e8e5062ef42b2717947f747a
2017-06-28 17:44:16 +00:00
TreeHugger Robot
b365594242 Merge "Update string: Gesture setting title" into oc-dr1-dev 2017-06-28 17:39:08 +00:00
jackqdyulei
a8957e15cc Update the UI for battery header
1. Make battery icon align to the end and make text layout
take all the other space.
2. Update the spec based on red line.

Bug: 63037934
Test: Screenshot
Change-Id: I1adbf5ce3e54712cbdc276db2357c7a24b48fe65
2017-06-28 10:29:01 -07:00
jackqdyulei
051fb19dd4 Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev am: 7ea8ecdae1
am: fc55a3cef1

Change-Id: I7d23a1bab37417064a1ffc358f9856d711426c19
2017-06-28 17:20:04 +00:00
jackqdyulei
fc55a3cef1 Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev
am: 7ea8ecdae1

Change-Id: Ie6b814cf75ab555a94f2eb204499d10ae7a4cb0e
2017-06-28 17:16:34 +00:00
TreeHugger Robot
7ea8ecdae1 Merge "Add quickUpdate method to BatteryHeaderPrefCtrl" into oc-dr1-dev 2017-06-28 17:08:46 +00:00
Fan Zhang
8f6e3e836d Update string: Gesture setting title
Change-Id: Ib73e300cb4b809dcc1da594ac6f84d9d020aeac9
Fix: 36685646
Test: visual
2017-06-28 15:40:04 +00:00
Doris Ling
d5d4ae7348 Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev am: c074c1c8fe
am: da9d206916

Change-Id: Ia2d3416b079c617450562eb0daf3ab3625b83d0f
2017-06-28 01:50:20 +00:00
Doris Ling
da9d206916 Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev
am: c074c1c8fe

Change-Id: Ibe3d07e72916fd45c1959e4dc194040b5bed3d17
2017-06-28 01:46:48 +00:00
TreeHugger Robot
c074c1c8fe Merge "Fix crash when initializing Settings suggestions." into oc-dr1-dev 2017-06-28 01:41:34 +00:00