Commit Graph

693 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
fef5f6aa4a Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev 2017-08-08 22:13:13 +00:00
Fan Zhang
0cb4c86f4a Clean up logic for dismissing suggestion
We no longer bring suggestions back after dismissing, so some logic is
no longer necessary.

Change-Id: I9d931fbbbc79bade191bebf6d057870d088a5fde
Fixes: 64297191
Test: robotests
2017-08-04 11:16:17 -07:00
Doris Ling
9f90680456 Fix crash when dismissing suggestions.
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the list
should be done in the sublist instead of the original list to maintain
the list consistency check.

Hence, when dismissing the suggestion, change to remove the suggestion
from the suggestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.

Bug: 64279080
Test: make RunSettingsRoboTests
Change-Id: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
2017-08-03 15:12:36 -07:00
Fan Zhang
56538f1775 Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev
am: 9064072ed7

Change-Id: I8aec2dc4de1ec18375ce3af177f1c9769499f8e3
2017-07-31 19:09:10 +00:00
Fan Zhang
4f04c68dd1 Remove DND and all gesture suggestions from Settings
Change-Id: I2f59c426132ca907e556b8bb2fbc869f4e830768
Fix: 64156274
Test: robotests
2017-07-28 14:39:48 -07:00
TreeHugger Robot
70f0013e43 Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev 2017-07-27 23:41:35 +00:00
TreeHugger Robot
1f34a5cf46 Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev 2017-07-27 21:14:43 +00:00
Doris Ling
2798c24deb Limit the suggestions to be shown to 5.
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Change-Id: I3bbc08bb67c411ff5671a837efa40da0ac885983
Merged-In: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 64072051
Test: make RunSettingsRoboTests
2017-07-27 12:50:47 -07:00
Soroosh Mariooryad
6f0e9273f8 Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Ia59839d3b952420390896d06c030905853df92e7
2017-07-27 17:54:48 +00:00
Doris Ling
4940539479 Limit the suggestions to be shown to 5.
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Bug: 64072051
Change-Id: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 63309218
Test: make RunSettingsRoboTests
2017-07-27 10:45:30 -07:00
Soroosh Mariooryad
a861d11027 Update suggestion ranking model coefficients.
- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.

Test: RunSettingsRoboTests & also manually testing suggestions
Bug: 64093782

Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64
2017-07-27 00:38:42 -07:00
Kevin Chyn
2a2dcb52cb Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-25 02:33:30 +00:00
Kevin Chyn
82792cc5b3 Fingerprint swipe settings and suggestions should not show if hardware unavailable
Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-24 13:40:34 -07: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
Fan Zhang
e651ddf9e6 Add shadow to searchbar when user scrolls vertically
Bug: 63528057
Test: robotests

Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
2017-07-20 20:32:09 +00:00
TreeHugger Robot
5002b97d37 Merge "Check the tintable metadata before tinting tile icon." 2017-07-18 19:52:30 +00:00
Doris Ling
7087fd92a1 Check the tintable metadata before tinting tile icon.
When determining whether to tint the tile icon, first check whether the
tintable metadata set for the tile. If no metadata set, will then follow
the default logic that tint the tile icon if it is not coming from the
Settings package.

Change-Id: Idf0863e0c6ab063aeaa6d013fa620508ced31fdb
Fix: 62473193
Test: make RunSettingsRoboTests
2017-07-18 10:39:47 -07:00
Doris Ling
00de10c32b Merge "Add background color to suggestion/condition view." into oc-dr1-dev am: edad87c4b0
am: e8d37d9d75

Change-Id: I546eabf134f90c0002a010590edfbefa68c34216
2017-07-17 22:26:49 +00:00
TreeHugger Robot
edad87c4b0 Merge "Add background color to suggestion/condition view." into oc-dr1-dev 2017-07-17 22:18:31 +00:00
Doris Ling
87eb423564 Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev am: ef8e2db876
am: fb64a7f74c

Change-Id: Ib3d86ef233acea8b2f090941a8bc11480ed78ef0
2017-07-15 01:17:18 +00:00
TreeHugger Robot
ef8e2db876 Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev 2017-07-15 01:05:41 +00:00
Doris Ling
1b6685f4a4 Add background color to suggestion/condition view.
- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual
2017-07-14 15:34:42 -07:00
Doris Ling
01fe5b45b4 Fix crash on expanding settings conditions.
Check for non-empty suggestions instead of non-null suggestions when
trying to determine whether to show conditions or suggestions list.

Change-Id: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Merged-In: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests
2017-07-14 13:04:30 -07:00
Doris Ling
a54ebe87f2 Merge "Fix crash on expanding settings conditions." 2017-07-14 19:53:39 +00:00
Doris Ling
0018f1680f Update spacing in suggestion/condition header and footer.
Adjust the top/bottom padding for the header and footer so that the
content is center-aligned.

Change-Id: I01c0baf770abf3a8767a016a758ee1794403598b
Fix: 63670820
Test: Visual
2017-07-14 12:31:12 -07:00
Doris Ling
11f4619816 Fix crash on expanding settings conditions.
Check for non-empty suggestions instead of non-null suggestions when
trying to determine whether to show conditions or suggestions list.

Change-Id: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests
2017-07-13 16:16:12 -07:00
Fan Zhang
a7b04ed692 Merge "Show default app icon in default app screen." 2017-07-13 22:41:16 +00:00
Doris Ling
36c1934162 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am: a7f5953a02
am: be7044845d

Change-Id: I64412b26bacf567973989fbeaa2cfe2ca42e87b4
2017-07-13 21:28:54 +00:00
Fan Zhang
2ea6700336 Show default app icon in default app screen.
- Renamed AdvancedAppSettings to DefaultAppSettings.
- Add logic to DefaultAppPreferenceController to also display icon.
- Modified DefautlAssistPrefController to suppress gear icon, and use
  the controller in default app setting UI to display icon.
- Remove dynamic injected payment setting activity and create the
  setting statically in xml.
- Add DefaultPaymentSettingsPreference to display default payment app
  title (no icon because we can't get it)

Change-Id: I6b8c768da0bafe5ec9a85ba9c79c7993b449be25
Fix: 36458534
Test: robotests
2017-07-13 13:49:28 -07:00
Doris Ling
84c7739986 Fix mokey crash on swiping settings condition.
When the condition card is being swiped, add null check for the
retrieved Condition to ensure it is still valid before trying to
dismiss it.

Change-Id: I265091a5fe290e359fa9a6e16b1d87c03894c1b8
Fix: 63624859
Test: make RunSettingsRoboTests
2017-07-13 11:00:29 -07:00
Doris Ling
df055c8655 Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:50:48 -07:00
Doris Ling
78e08f0f0a Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Bug: 63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:22:53 -07:00
TreeHugger Robot
d432e07e91 Merge "Disable suggestion on low memory devices" 2017-07-07 02:17:29 +00:00
Fan Zhang
1e0b51218b Disable suggestion on low memory devices
Change-Id: I9d22170845661fc8b48b116c9b09f758926c096f
Fix: 63157777
Test: make RunSettingsRoboTests
2017-07-06 16:13:28 -07:00
TreeHugger Robot
0002680697 Merge "Fix race condition and optimize categoryUpdater refresh" 2017-07-06 18:54:43 +00:00
Fan Zhang
aeb94f0e5c Fix race condition and optimize categoryUpdater refresh
- In SettingsActivity, do not call updateCategories() if nothing
  changed.
- In SummaryLoader, create a mapping between tile key and summary. This
  is necessary to handle a race condition where category is refreshed
  after summary load.
- In DashboardSummary, refresh Tile's summary to latest cache value
  everytime category is refreshed.

Change-Id: I61389b8ba614ba7e34939325bada6e1bd6fa6709
Fix: 63149109
Test: robotests
2017-07-06 10:13:58 -07:00
Daniel Sheng
9a16e473ab Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Daniel Sheng
11d240c300 Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07:00
Daniel Sheng
f7c459c9e5 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner
Change-Id: I7337a141cb21e5a1399aaca05ec1facd8629577b
Merged-In: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 17:35:03 -07:00
Daniel Sheng
20d5588a27 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner

Change-Id: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 09:05:11 -07:00
Fan Zhang
b487fae5d8 Code cleanup: DashboardAdapter.category is no longer a list
We only ever display a single DashboardCategory in homepaeg, so the
category doesn't need to be a list in DashboardData/Adapter

Change-Id: I57db02bb45cbc511f0fce1bf33043b51ef9db15c
Fix: 33861822
Test: updated robotests
2017-06-30 15:30:51 -07:00
TreeHugger Robot
a1bf76a69d Merge "Also tint the settings icon in DashboardAdapter.setCategory()." 2017-06-30 20:07:40 +00:00
Fan Zhang
a29346bab8 Change the way we generate stable id for DashboardSummary
- The countItem() method generates id based on position of Tile. This is
not truely stable.
- Added stable id constants for static views, and use hash of title as
stable id for tiles.

Bug: 33861822
Test: robotests
Change-Id: Ibbc88c82655503dc3964cb0c430c779dc9c93d41
2017-06-29 14:21:43 -07:00
TreeHugger Robot
4ef813efdc Merge "Disable SmartSuggestion conditionally" 2017-06-29 01:55:52 +00:00
Doris Ling
067122a8e4 Also tint the settings icon in DashboardAdapter.setCategory().
When suggestion loader takes longer time to complete, we will first show
the dashboard with just the categories, and refresh the UI when the
suggestion is ready. However, we only tint the icon when we update both
the categories and suggestions, and hence in some case, some tile
results with icon not being tinted.

Change-Id: I023d50655349731b03c7d7aff153d2cbbd8c63e0
Fix: 37456962
Test: make RunSettingsRoboTests
2017-06-28 16:12:38 -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
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