Commit Graph

1146 Commits

Author SHA1 Message Date
Fan Zhang
e84911dcf9 Add content description to suggesiton footer
Change-Id: I90402301f9a294326619d8e353e14c1db9962b86
Fixes: 67633955
Test: manual
2017-10-10 12:59:08 -07:00
Fan Zhang
13ce220807 Log cleanup: remove unnecessary logging for suggestions
- Remove show_suggestion logging in DashboardAdapater. Showing
  suggestion is logged inside SuggestionAdapter during onBind.
- Remove hide_suggestion logging. It's not used by anyone.
- Move SuggestionLogHelper into SuggestionFeatureProvider

Bug: 65065268
Test: robotests
Change-Id: I1e7929d739b79527d2ae01c25177676f6be6ddff
2017-10-05 18:23:57 -07:00
Fan Zhang
a078526920 Support suggestion UI card with a button.
Bug: 65065268
Test: robotests
Change-Id: I24c8947e9b23a80de38b8cbd57404736a5d1660a
2017-10-05 15:44:18 -07:00
TreeHugger Robot
82869360d0 Merge "Bind icon and remote views for Suggestion" 2017-10-03 22:20:03 +00:00
Soroosh Mariooryad
d644a835ae Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev am: 0193e69597
am: 73679c124f

Change-Id: I25949dd1c2bdf31ec07cd3b963ac6b693cf3a0e4
2017-10-03 18:38:27 +00:00
Fan Zhang
e7337b3ec7 Bind icon and remote views for Suggestion
Bug: 65065268
Test: robotests
Change-Id: I181a9e092c56f4e45addfc1cde166fb7dac7becd
2017-10-03 11:18:12 -07:00
Fan Zhang
2985a0775d Create suggestion state provider.
- The provider now handles isSuggestionComplete check
- Remove SuggestionChecks class.

Bug: 65065268
Test: robotests
Change-Id: Id45d67d4a5146cc023f7fad7bb292b4c1c14a782
2017-09-29 15:42:20 -07:00
Fan Zhang
31f699c281 Move code from SuggestionChecks to FeatureProvider
This is step one to deprecate SuggestionChecks. Moving logic into
SuggestionFeatureProvider allows potential logic override and improves
testability.

Also moved isSuggestionComplete tests to corresponding activity/pref
controller test.

Bug: 65065268
Test: robotests
Change-Id: I2071d30fc58bb84acad2083ca03cfcf7d41f10cb
2017-09-29 11:36:16 -07:00
Fan Zhang
cd7b13bba5 Plumb SuggestionControllerMixin to DismissController.
- The SuggestionControllerMixin is needed to dismiss a suggestion.
- When swipe a suggestion, SuggestionControllerMixin is called, which
  then calls API in SuggestionService to dismiss a suggestion.

Bug: 65065268
Test: robotests
Change-Id: I6a0c5823d60b995ab4a36b1c91777f5cd31a500d
2017-09-26 14:09:22 -07:00
Soroosh Mariooryad
2aab11772d Fix ANR issue caused by sharedpref commit() on suggestion event logging
Test: RunSettingsRoboTests
Fixes: 66719302

Change-Id: I5e99a279d5c72409b8ca982148396f7d1e0d46b7
2017-09-22 16:10:13 -07:00
Fan Zhang
6598a7b4cd Let SuggestionFeatureProvider manage SuggestionService name
Bug: 65065268
Test: robotests
Change-Id: I82315a7b1565dc34b516bf685ad8e831a1e28591
2017-09-21 18:25:40 -07:00
TreeHugger Robot
10ba1f1ee7 Merge "Fix NPE when calling getSuggestionV2 in adapter." 2017-09-20 17:57:45 +00:00
Fan Zhang
45424c5464 Fix NPE when calling getSuggestionV2 in adapter.
Change-Id: I3aa498c2255107ca2e33046f3df629c2ef43ec5c
Fixes: 66111737
Test: robotest
2017-09-20 09:19:17 -07:00
Christine Franks
bfb671391d resolve merge conflicts of 92f7794d90 to master
Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
2017-09-19 18:24:33 -07:00
Christine Franks
cb52e803bf Merge "Handle night display state when timezone changes" into oc-mr1-dev 2017-09-20 00:23:29 +00:00
TreeHugger Robot
530de5be78 Merge "Load suggestions through SettingsIntelligence." 2017-09-19 23:36:38 +00:00
Ajay Nadathur
eedc449654 Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am: dc66f96dda
am: b4b657179f

Change-Id: I86c4f0b77dd9be9926e92dd5c2cd57cce5c3e3d4
2017-09-19 22:36:09 +00:00
Fan Zhang
82cb5a5cc8 Load suggestions through SettingsIntelligence.
- Add flag to switch between old/new implementation
- Add SuggestionLoader to load using Loader (instead of AsyncTask)
- Update DashboardAdapater/SuggestionAdapter to take List<Suggestion>
- Marked old getter/setters as @Deprecated and added comment
- Update tests to cover suggestionV2 adapter changes.

TODO:
- Handler for dismissing suggestion not set up yet.
- Suggestion data structure is incomplete (missing icon, remote view, etc)
- Need to extend Suggestion data strcture to support icon and
  remote view binding

Bug: 65065268
Test: robotests
Change-Id: I2378ef4c9edee972d5de93c3868068e2cde23f56
2017-09-19 11:56:54 -07:00
Ajay Nadathur
a7ca53bc41 Deferred setup banner updates intermittently
bug: 65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
2017-09-19 18:50:25 +00:00
Christine Franks
c6c299bdbb Handle night display state when timezone changes
Bug: 64458884
Test: make RunSettingsRoboTests -j100

Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
2017-09-19 10:54:13 -07:00
Doris Ling
c879239238 Add metadata handling for specifying tile order.
- if tile order is set in the metadata, it will be used as preference
order instead of the intent priority specified.

Change-Id: If1a09219ece7bb71fc476aad60dc66d7653dfd28
Fixes: 65172575
Test: make RunSettingsRoboTests
2017-09-18 16:19:05 -07:00
TreeHugger Robot
6a48c518c3 Merge "Move SuggestionService AIDL related calls to a controller." 2017-09-16 02:41:27 +00:00
Fan Zhang
7c60efb930 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev am: a42e9351c5
am: 3f070569a6

Change-Id: I7bf58afdb746d70b2a2728875b83d0f0c547d51e
2017-09-16 00:40:43 +00:00
TreeHugger Robot
a42e9351c5 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev 2017-09-16 00:33:33 +00:00
Fan Zhang
ffd531f1d3 Move SuggestionService AIDL related calls to a controller.
The controller makes it easier to manage IPCs and make it easier for
testing.

Bug: 65065268
Test: robotests
Change-Id: Ie5797655543cb22d8196267058598a1b4222a8d1
2017-09-15 17:32:49 -07:00
Fan Zhang
135fecbee3 Use "mid" stable id for condition cards conditionally.
When there is no suggestion, use "mid" stableId instead of "top"
stableId for the header card.

This avoid an animation jank: when user swipes away a suggestion, the
condition summary header moves up instead of disappears then reappears.

Old behavior:

---  Suggestion ---   --swipe-->     /// Top Header ///
///  Mid Header ///

New behavior:

--- Suggestion ---   -- swipe -->   /// Mid Header ///
/// Mid Header ///

(Notice the header id change)

Change-Id: I63512d3d21382488e43dddb8819fabe4af40d101
Fixes: 65729560
Test: robotests
2017-09-15 14:56:27 -07:00
Doris Ling
36ed425ab2 Merge "Add a new feature flag for the expand button in support lib." 2017-09-15 21:38:31 +00:00
Doris Ling
6f60cddc9e Add a new feature flag for the expand button in support lib.
- check the feature flag to determine whether to use the existing
progressive disclosure mixin or use the expand button in the support
library.
- add corresponding preference xml files that add the new preference
group attribute to use with the expand button in the support lib.

Bug: 63985174
Test: make RunSettingsRoboTests
Change-Id: Ida6eb6182a8066ad1413b7f6142512345fd914d0
2017-09-15 11:56:31 -07:00
TreeHugger Robot
467596b0f4 Merge "Consolidate all wrappers used for testing." 2017-09-15 03:14:52 +00:00
Doris Ling
dee1a22c45 Consolidate all wrappers used for testing.
- Add the wrapper package and move all wrappers to the wrapper package.
- Get rid of some wrapper interface/impl implementation and have a
wrapper class directly.

Bug: 65634579
Test: make RunSettingsRoboTests
Change-Id: Ic757d8f7bacfa7a034c7e692205bc1dc4b0e1de1
2017-09-14 18:24:49 -07:00
Fan Zhang
230b3767d9 Add feature flag for suggestion/SettingsIntelligence integ.
Bug: 65065268
Test: robotests
Change-Id: I42e1f8b01d7b82de3b94bd77943a9a119adf5867
2017-09-14 16:04:35 -07:00
TreeHugger Robot
fe18f8e876 Merge "Integrate with SettingsIntelligence" 2017-09-14 21:52:16 +00:00
Soroosh Mariooryad
5ba0f51bcd Log smart settings suggestion enabled/disabled state for A/B experiments
Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: Iadfa575b9a21caecb515b9975d388ee0d0480c11
2017-09-14 10:43:56 -07:00
Soroosh Mariooryad
7fe6f50bf7 Log smart settings suggestion enabled/disabled state for A/B experiments
Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: I0cf4b4a0e8470cd40d38e8fe937cfb5f3e96f380
Merged-In: Iadfa575b9a21caecb515b9975d388ee0d0480c11
2017-09-13 23:25:52 -07:00
Fan Zhang
d040ecd499 Integrate with SettingsIntelligence
Bug: 64691432
Test: robotests
Change-Id: Idd20fd66f0289e0d0178bac02b1059c5554673f4
2017-09-13 17:48:37 -07:00
TreeHugger Robot
c939be6551 Merge "Fork a new developer options page." 2017-09-11 19:47:26 +00:00
Fan Zhang
4c26da9e13 Fork a new developer options page.
- Create a new activity/fragment and add it to manifest
- Mark old activity/fragment deprecated
- Enable/disable the new activity based on FeatureFlag
- Initial skeleton code for new fragment

Bug: 65522852
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest
Change-Id: Ib1395693f8b6f61d4726573a9ea841ea53cf207b
2017-09-10 15:02:51 -07:00
Fan Zhang
1f92faad27 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev am: 90f9398f4e
am: ed71e21541

Change-Id: Ic2f5d6c35ac8bb7a14d1949be53beb6b6bf4cd16
2017-09-08 22:23:19 +00:00
TreeHugger Robot
90f9398f4e Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev 2017-09-08 21:42:32 +00:00
Ajay Nadathur
2e6e4c12a9 Merge "Set title in remote views if present in bundle" 2017-09-08 05:09:21 +00:00
Fan Zhang
1ca6b25321 Don't attempt to tint icon if icon is not available
Change-Id: I0aa2a17d51d966dce182381c7bba8913ad997738
Fixes: 65460834
Test: robotests
2017-09-08 00:10:55 +00:00
Fan Zhang
3ed509cb35 Some code cleanup
- Formatting
- Remove unused code

Test: robotests
Change-Id: If259c7c3893df96744f3c0ad62a378ef6ce01de7
2017-09-07 10:48:45 -07:00
Ajay Nadathur
ab07989b97 Set title in remote views if present in bundle
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call

bug: 62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
2017-09-07 14:56:38 +00:00
Ajay Nadathur
d1c3084bd5 Set title in remote views if present in bundle
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call

bug: 62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
2017-09-06 15:25:04 -07:00
Doris Ling
d76a310520 Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev am: 51c83353fe
am: e80bb0d5ce

Change-Id: Id3de7150516804bc7a08c665943769c27173fc9a
2017-08-25 03:48:07 +00:00
Doris Ling
5b01294d84 Fix jank in showing conditions and suggestions in cold start.
When we first initialize the dashboard view, and register the condition
listener, it will trigger the condition changed callback immediately.
This results in unnecessary refresh of the dashboard header. Add check
to not do the refresh when we first initialize the view.

Change-Id: If7c69637463734c150b7f5eb7f3c042cf73837fa
Fixes: 64811475
Test: make RunSettingsRoboTests
2017-08-24 13:53:30 -07:00
Doris Ling
d9d877cb48 Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev am: d94fbbc325
am: c2eab36c7c

Change-Id: I09efabd3f8a4a7358f2b6a6d52a15fdd75ca7672
2017-08-24 01:11:22 +00:00
Fan Zhang
18a168239e Index TTS-Settings and dedupe TTS-engine in search result.
Fixes: 63022866
Test: robotests
Change-Id: I5c711e7bafba4e413ee271768c58742be05d8640
2017-08-16 15:46:41 -07:00
Doris Ling
97da51876b Fix null pointer exception when logging suggestions.
In monkey test, the suggestions list can become null. So, add check
for valid suggestions list before trying to iterate through the
suggestions.

Fixes: 64757618
Test: make RunSettingsRoboTests
Change-Id: Ib670808a4f222187b9cd53d7d939e71b5ce8dbae
2017-08-16 15:26:03 -07:00
Fan Zhang
1228a6af18 Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev am: fef5f6aa4a
am: b5989fc3b7

Change-Id: I189c0936ca9c96d1a686d33bc7da729f6a17d55b
2017-08-08 22:53:23 +00:00