Commit Graph

621 Commits

Author SHA1 Message Date
Android Build Merger (Role)
8cf066e34a Merge "Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd am: 7151be926d am: ecc7355bde" 2017-06-04 00:10:37 +00:00
Thecrazyskull
07a97c7d8a Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd am: 7151be926d
am: ecc7355bde

Change-Id: Ic422ded3965a9f8bc3cafb7cbf0b1e4585142672
2017-06-04 00:10:11 +00:00
Thecrazyskull
ecc7355bde Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd
am: 7151be926d

Change-Id: I16805427f0d053c6d1c5975275f00cb0ed1c9cbb
2017-06-04 00:04:25 +00:00
Treehugger Robot
46f7199cb1 Merge "ConditionManager: don't crash when trying to add unexpected condition" 2017-06-03 23:49:39 +00:00
Fan Zhang
9011a67431 Add a suggestion: showing new device features
- New suggestion activity
- Removed useless api SuggestionFeatureProvider.isPresent().

- Also updated support activity search indexing icon and summary

Change-Id: Ib52cf26a985f57bf0aac918606b10f75bd024639
Fix: 62034077
Fix: 62196070
Test: make RunSettingsRoboTests
2017-06-03 14:51:09 -07:00
Thecrazyskull
f7791d75bf ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition

Test: none

Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
2017-06-02 22:50:47 +00:00
Doris Ling
83a6621b38 Combine settings suggestion and condition.
- Add a flag in dashboard feature provider to specify whether to use the
combined UI for suggestions and conditions.
- Move Conditions below Suggestions.
- Add dashboard entity for condition and suggestion container, and
  wrap the condition and suggestion list inside the container. The
  container itself will be a single dashboard item, and within it will
  be the list of suggestion or condition.
- Add suggestion/condition header that will show the combined info for
  the conditions and suggestion data, and have the expand button to
  control expanding both the suggestion and condition list.
- Change the individual condition card to be always expanded, and
remove the logic to collapse/expand individual condition card.
- Remove the divider between the action button and condition detail
  within each condition card.
- Add suggestion/condition footer for collapsing the whole suggestion and
  condition list.

Bug: 37645754
Test: make RunSettingsRoboTests
Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
2017-06-02 14:59:48 -07:00
Andrew Sapperstein
9448f68171 Merge "Initial search bar implementation." into oc-dev
am: 91fe76263f

Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
2017-06-01 20:01:49 +00:00
TreeHugger Robot
b42162c819 Merge "Pass component name into SuggestionFeatureProvider" 2017-06-01 19:33:29 +00:00
TreeHugger Robot
9ccd8ab619 Merge "Add search index for support dashboard activity." 2017-06-01 17:03:06 +00:00
Andrew Sapperstein
048f6fb8b3 Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-05-31 15:24:25 -07:00
Fan Zhang
b47373014f Add search index for support dashboard activity.
Change-Id: Ie9cf20316f94454a3d41f76d05b662e398c2c2ea
Fix: 36005923
Test: make RunSettingsRoboTests
2017-05-31 14:15:14 -07:00
Andrew Sapperstein
14934599dd Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug: 37477506
Test: make RunSettingsRoboTests
2017-05-31 14:03:26 -07:00
Maurice Lam
7551c80bc8 Pass component name into SuggestionFeatureProvider
So that the provider can be used for more than one suggestion.

Test: Robolectric test for implementation of the provider
Bug: 62039057
Change-Id: Ibea41ea6d98e67c55ec157556675e854f3ea31c4
2017-05-30 13:07:51 -07:00
TreeHugger Robot
cf68422c22 Merge "Add SupportDashboardActivity to secondary user home AI" 2017-05-16 22:38:09 +00:00
Salvador Martinez
8ee06bc775 Add SupportDashboardActivity to secondary user home AI
Secondary users could not see the support preference in the
settings home screen because it was missing from the list of
whitelisted activities. This CL adds the SupportDashboardActivity
to the list so that secondary users can see it.

Test: Robotests still pass for SettingsGateway
Change-Id: Ia48dbd5b8d396c1bdf050c102fee0a5cd5300ed2
2017-05-16 18:05:54 +00:00
Juan Lang
a5f0a82f8f Merge changes from topic 'footer-settingslib'
* changes:
  Depend on SettingsLib's version of lifecycle and FooterMixin.
  Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +00:00
Fan Zhang
59fd017ce5 Revert "Revert "Filter and display top 3 suggestions for exclusive type""
This reverts commit 184ae963e7.

Change-Id: Iac60fc52a5b0c153945c22b97394546a529d3bb4
2017-05-12 18:12:58 +00:00
Juan Lang
777ed2535a Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
2017-05-12 11:10:46 -07:00
Fan Zhang
184ae963e7 Revert "Filter and display top 3 suggestions for exclusive type"
This reverts commit 70b634adcf.

Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
2017-05-12 18:03:58 +00:00
Fan Zhang
70b634adcf Filter and display top 3 suggestions for exclusive type
Change-Id: Ief4c2f02fcf1064dac3659502bd7511b09a2a7df
Fix: 37947647
Test: make RunSettingsRoboTests
2017-05-12 08:47:39 -07:00
Doris Ling
f4cd59a5b1 Merge "Fix crash when silencing condition." into oc-dev am: ba2f3ee3ba
am: ce5e0c3dc6

Change-Id: I9e5c4f0f9f8ee4cdced52bf1f9d79b28912bb154
2017-05-10 03:18:21 +00:00
Doris Ling
ce5e0c3dc6 Merge "Fix crash when silencing condition." into oc-dev
am: ba2f3ee3ba

Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
2017-05-10 01:45:17 +00:00
Fan Zhang
7afbf0f3a2 Add support to show first impression type suggestions
- Add FIRST_IMPRESSION type in suggestion order list.
- Make rule changes for a few suggestions.

Bug: 37947647
Test: manual

Change-Id: I2101f5e0f6424723bacc9f5febf2ffaab9398896
2017-05-09 14:20:43 -07:00
Doris Ling
b72163b9d0 Fix crash when silencing condition.
- check if the broadcast receiver is being registered before trying to
un-regist it.

Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix: 38131851
Test: make RunSettingsRoboTests
2017-05-08 15:28:33 -07:00
TreeHugger Robot
ff174c73b2 Merge "Create RestrictedDashboardFragment." 2017-05-08 22:14:21 +00:00
jackqdyulei
e407e67a3b Create RestrictedDashboardFragment.
RestrictedDashboardFragment has all the same logic coming from
RestrcitedSettingsFragment but extends from DashboardFragment.
As a result, we could use preferenceController in child class of
RestrictedDashboardFragment.

This cl also make DeviceListPreferenceFragment as child of
RestrictedDashboardFragment, which enfluences the bluetooth page.

Bug: 38041586
Test: Build
Change-Id: I01395d506176c5cc584948478f7ca16c1c7c7045
2017-05-08 13:34:54 -07:00
TreeHugger Robot
4ae7816fb6 Merge "Revert "Remove custom layout for expandpreference."" 2017-05-05 20:41:49 +00:00
Fan Zhang
3c8cad4a67 Revert "Remove custom layout for expandpreference."
This reverts commit 403ff14638.

Change-Id: Ia13843842d147da0ff52b0898c39393d5a113f06
2017-05-05 16:03:44 +00:00
Fan Zhang
6db910ab85 Merge "Skip "null" string when building advanced button summary" into oc-dev am: e4eb65c00e
am: d8b6244d82

Change-Id: I0ea1c236ee55c1bb784a39bc8a4990d47616397b
2017-05-04 16:20:46 +00:00
Fan Zhang
d8b6244d82 Merge "Skip "null" string when building advanced button summary" into oc-dev
am: e4eb65c00e

Change-Id: Ife67012f081f60d06fc3cec7d40673dfb3e032dc
2017-05-04 16:17:46 +00:00
Fan Zhang
540023608d Skip "null" string when building advanced button summary
- Also added help string to SoundSettings as a side fix.

Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix: 37933524
Test: robotests
2017-05-03 15:05:22 -07:00
TreeHugger Robot
f223383936 Merge "Remove custom layout for expandpreference." 2017-05-02 19:55:15 +00:00
Fan Zhang
403ff14638 Remove custom layout for expandpreference.
It's no longer needed.
Test: manual
Change-Id: I704255ee217d1142ac81c738feef212224bae4e8
2017-05-02 11:12:44 -07:00
Miao Miao (苗苗)
e1e918e4a8 Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2 am: b1480c8cab
am: d0cb54b27e

Change-Id: I7430b38a73cf22b823121db3c2287f3afdb63d79
2017-05-02 17:54:44 +00:00
Miao Miao (苗苗)
d0cb54b27e Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2
am: b1480c8cab

Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
2017-05-02 17:48:41 +00:00
Treehugger Robot
2ed42d009b Merge "Settings crash when receiving data state broadcast" 2017-05-02 17:39:45 +00:00
Andrew Sapperstein
22f0df3968 Merge "Add ability to switch between support versions" 2017-05-01 22:37:32 +00:00
Fan Zhang
5801c66ad7 Merge "Add emergency broadcast to app & notification settings." into oc-dev am: 908cad27ab
am: ae112c8a46

Change-Id: I879f97321c9a3af20a1c8ec2de49c8fcf4bedbe9
2017-04-29 06:59:44 +00:00
Fan Zhang
d53c6d57f3 Add emergency broadcast to app & notification settings.
Also fixed a bug where progressive disclosure expand button is displayed
incorrectly when # of preference == threshold exactly.

Change-Id: I518687e374853ae8ab1c7e5337822492d6fd99ff
Fix: 36557600
Test: robotests
2017-04-28 14:36:17 -07:00
Fan Zhang
0a257ee1ba Add flag to control whether or not we should tint icons
Fix: 34365726
Test: robotests
Change-Id: Ic08d8590c9867fb0383da03f05237f74644a77ff
2017-04-28 09:54:33 -07:00
Salvador Martinez
9f629d6980 Add ability to switch between support versions
Creates a trampoline activity and adds functionality
to the SupportFeatureProvider interface so that we can
conditionally launch support V1 or V2.

Test: Test in ag/2144016
Bug: 37306241
Change-Id: I6d24e65cad91692e457ea216713e90239845b4f5
2017-04-27 15:13:33 -07:00
Miao Miao (苗苗)
e4b5d69493 Settings crash when receiving data state broadcast
Stress/Stability testing, Settings crash when receiving data state 
broadcast
Solution: Do null judgement before function was called
Test: Stress/Stability test

Change-Id: Id71448ed89eeffcea268c4a2e7154d9ea7639db4
2017-04-27 07:57:23 +00:00
Fan Zhang
334e1957e0 Merge "Resolve intent before launching from DashboardFragment." into oc-dev am: c028a7d976
am: 09a840ebab

Change-Id: Id67a9415b0fdbf585bdb8d0533775a5e56995341
2017-04-27 06:04:53 +00:00
Fan Zhang
3c7ca105df Resolve intent before launching from DashboardFragment.
Once dashboard tile is displayed, the underlying intent can be disabled.
We will eventually hide the item from UI, but there can be a brief
moment before we are able to hide it. So to prevent user click and
launch a non-exist intent, we will try to resolve it first before
launching anything.

Change-Id: Ic8d790bf3c5d4d269eadb757f789a1641928a7b7
Fix: 36036097
Test: make RunSettingsRoboTests
2017-04-26 14:44:12 -07:00
Fan Zhang
0576ea48b5 resolve merge conflicts of e8411c4454 to master
Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
2017-04-25 16:16:12 -07:00
Daniel Sheng
1721b802c5 Added settings UI for camera lift trigger gesture
Bug: 37154489
Test: manual + make RunSettingsRoboTests

- Added preference fragment for camera lift gesture
- Added activity alias for camera lift gesture setting
- Added resources + overlays for camera lift gesture setting
- Added config flag for limiting camera lift gesture setting for Pixel
- Added Robolectric tests for camera lift gesture settings classes

Change-Id: Ie4846cb1ea6b5279a19f20cb0299426f0d5cbb71
2017-04-24 14:57:55 -07:00
Fan Zhang
0c6bd7efe7 Properly check wallpaper state before showing suggestion
The old check only considers static wallpaper. So if user set a dynamic
one we still think wallpaper is not set.

Change-Id: I3fa0908b29891cf7b90c24d5a63ce60d5985a70d
Fix: 34719455
Test: make RunSettingsRoboTests
2017-04-21 09:58:29 -07:00
Ajay Nadathur
22ebdd9493 Fingerprint suggestion should not be dismissed until fingerprint added
- Do not dismiss fingerprint suggestion until atleast one fingerprint is
added.

bug: 36578142
Test: robotest & manually verified.
Change-Id: I3151c9ae971666a0964be007103a9b7ad41de5ce
(cherry picked from commit 51ef801b32)
2017-04-20 11:34:54 -07:00
Julia Reynolds
90f49214d0 Merge "Consolidate notification settings." into oc-dev am: 6adf04c741
am: bcaa8ecb24

Change-Id: Id632a07d66080acb4368c1789ce829ff8898b378
2017-04-18 02:03:01 +00:00