Commit Graph

539 Commits

Author SHA1 Message Date
joshmccloskey
6634c159fd Adding slice for Face Enrollment
Fixes: 134965754
Test: Verified slice appears when not enrolled.
Test: Verified slice does not appear when enrolled.
Test: Verified slice disappears after clicking on icon and going back
to settings page.
Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843
2019-06-24 17:41:36 -07:00
Yi Jiang
02777d3e1b Merge "Fix screen attention contextual card" into qt-r1-dev
am: 03c47e7687

Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
2019-06-06 13:23:32 -07:00
Yi Jiang
03c47e7687 Merge "Fix screen attention contextual card" into qt-r1-dev 2019-06-06 20:06:21 +00:00
Yi Jiang
b7098b181f Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
am: d81e2c36f6

Change-Id: I34f211f8234fe883c1a646bd27f5d73ca0067463
2019-06-05 17:10:30 -07:00
Yi Jiang
068062d423 Fix screen attention contextual card
Bug: 134537004
Bug: 134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
2019-06-05 16:20:30 -07:00
Yi Jiang
9df180a008 use different description strings for screen attention settings and contextual card
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug: 134457354
Bug: 134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
2019-06-05 13:22:19 -07:00
Alex Salo
ac7851e1ce Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
am: fa127bd6f7

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
2019-05-30 16:12:36 -07:00
Yi Jiang
7605494cc5 Adds contextual cards for screen attention in Settings Homepage
Bug: 128527964
Test: atest ContextualAdaptiveSleepSliceTest, maually verified.
Change-Id: Ifaea7d8d4391e91cf6cbde38a2506728f55913d8
2019-05-29 10:37:11 -07:00
Fan Zhang
d32e9b5229 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev
am: 17521d0ac7

Change-Id: Id702a72ce6adc1dbb20c4f00c0b16cf1ff5ef603
2019-05-14 17:41:06 -07:00
Fan Zhang
b4b7725937 Revert "Revert "Make subsettings display edge-to-edge""
This reverts commit 9e98b8cf0f.

We have to set clipToPadding false on scrollView to make it extend below
navbar. But the side effect is it stops clipping to padding. So it
overlaps with sibling views. In this case anything pinned on top of
screen (switchbar, pinned header for most UIs, and preview indicator for
font size page).

To fix them:
1. in preview pages, just revert back to clipTo*. Their UI doesn't scroll
   so it they don't need to special clip flag to begin with.
2. For pinned to top headers, we need to change the "z-order" by setting
   elevation and make sure background is not transparent.

Fixes: 132182711
Fixes: 132672399
Test: visually on normal screen, font size scree, wifi main setting UI,
      wifi data usage screen

Reason for revert: Rollforward with fix.

Change-Id: Ib6f7c4167b9a680a336f2a7310d82340094d3aac
2019-05-14 13:48:12 -07:00
Fan Zhang
9a51ede665 Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev 2019-05-14 17:17:26 +00:00
Fan Zhang
9e98b8cf0f Revert "Make subsettings display edge-to-edge"
This reverts commit c2a85a374d.

Bug: 132672399
Bug: 132182711
Test: n/a

Reason for revert: b/132672399

Change-Id: Icb34ae5b16b7a32215fe2c1a5f0d0d028c91b2ca
2019-05-14 16:31:08 +00:00
TreeHugger Robot
66db1f95e0 Merge "Make subsettings display edge-to-edge" into qt-dev 2019-05-14 00:05:47 +00:00
Colin Cross
807e861105 Use if instead of switch for resources
Converting to Soong will move some code from directly compiled
into the app to compiled into an Android library and then
shared between the app and the tests.  This will cause resource
IDs in the library to become non-final, which means they can
no longer be used in case statements.  Convert affect case
statements to if blocks.

Test: m RunSettingsRoboTests
Change-Id: I25742a374f06d3fa4decbfc0d223a350acc50881
2019-05-13 13:42:01 -07:00
Fan Zhang
c2a85a374d Make subsettings display edge-to-edge
Fixes: 132182711
Test: visual
Change-Id: I3b0635cba359f74d463c2360323d80c5c9533228
2019-05-13 10:07:13 -07:00
Jason Chiu
2c3e6c6434 Fix automatically directing the user to the captive portal in Wi-Fi Slice
The feature failed after the CL "Force the adapter to rebind cards with
a toggle".

Because toggle slices have been forced to rebind after starting another
activity and when any slice is updating. This unpins Wi-Fi slice and
stops WifiScanWorker and then clears the saved clicked network.

Solution:
1. Change ConnectToWifiHandler from activity to receiver and send
   broadcasts to it with FLAG_RECEIVER_FOREGROUND, so Wi-Fi slice won't
   be forced to rebind.
2. Seperate Wi-Fi scan worker and contextual Wi-Fi scan worker. Keep the
   original logic for the generic one, and then add the logic below to
   the contextual one.
3. Do not clear the saved clicked network when slice is unppined because
   it happens frequently in contextual homepage.
4. Introduce a static long in ContextualWifiScanWorker that updates once
   in every visible UI session. A session is when the screen is visible
   to user.
5. Use session token to determine whether auto-starting captive portal
   is needed.

Fixes: 128056349
Test: robotest, visual in homepage and network panel
Change-Id: I9e03c379806e124fa7253b2a635574b2433f6afc
2019-05-11 03:26:57 +00:00
Raff Tsai
3d2655c100 Log ACTION_CONTEXTUAL_CARD_SHOW in different place
Fixes: 132396134
Test: robolectric
Change-Id: I7d46df15fbc42838da0fa53f4db7e1aa026c3174
2019-05-11 08:28:08 +08:00
Fan Zhang
c084301c02 Merge "Display settings homepage content fully edge-to-edge" into qt-dev 2019-05-08 20:26:31 +00:00
Fan Zhang
3e14383a28 Display settings homepage content fully edge-to-edge
This is needed to support fully gesture navigation.

Bug: 132182711
Test: visual
Change-Id: Ifaf15ecec73b974356355a74e73754f95b84ad3e
2019-05-08 11:43:58 -07:00
Yi-Ling Chuang
0f75eb550e Add null check before setting the visibility of swipe background
Some contextual cards does not allow card dismissal, so they won't have
swipe background declared in the layout file. Add null check to prevent
from NPE.

Fixes: 132209310
Test: robotests & launch Settings
Change-Id: I31f897f445c4901d007c8187fe69aea416b915d1
2019-05-08 12:04:36 +08:00
Yi-Ling Chuang
ce9903e8db Hide dismissal swipe background before slice gets ready
Only make swipe background visible once slice has a successfual binding.

Bug: 131843256
Test: robotests
Change-Id: I7866873a217e8ca882634a48108939022713c87b
2019-05-07 17:54:33 +08:00
TreeHugger Robot
65a258e2a2 Merge "Clean up import in homepage" into qt-dev 2019-05-06 20:28:37 +00:00
Yanting Yang
67a4449ef5 Clean up import in homepage
- Update import for MetricsProto to SettingsEnums
- Remove unused import
- Sort import

Fixes: 131885942
Test: robotests
Change-Id: I9a5e06adaa19bac9c082f53f1c627356be7148d8
2019-05-03 18:52:07 +08:00
Jason Chiu
c37126628a Update the deprecated Slice APIs to the new ones
Fixes: 131880868
Test: build, visual, robotest
Change-Id: I2cbb8fe131ebb284dabc5a5d65e70db254691688
2019-05-03 17:33:09 +08:00
TreeHugger Robot
ccfd708b87 Merge "Clean Safetyhub feature flag from Settings." into qt-dev 2019-05-02 08:44:39 +00:00
yuanjiahsu
1da7fbb09d Clean Safetyhub feature flag from Settings.
Clean all related code, need submit together.

Test: Manually
Bug: 118848485
Change-Id: Icaa0c0736dfa4a7d96aba396a884c9d3383a0f22
2019-05-02 12:45:53 +08:00
Raff Tsai
f34d143d0c Fix Battery Fix slice can not displayed
Fixes: 123174237
Test: manual
Change-Id: I3b349a27be5ecffbc64aaccb709c443f6ada875b
2019-04-30 15:13:12 +08:00
TreeHugger Robot
15524dbaee Merge "Only shows two suggestion cards at once." into qt-dev 2019-04-30 00:58:18 +00:00
Yi-Ling Chuang
ec01bff5c4 Only shows two suggestion cards at once.
Displaying too many cards may overwhelm users, so limit
the number of suggestion cards that should be displayed to two.

Fixes: 126213965
Test: robotests
Change-Id: I17c43746f475b31121c5809e0e8c6cf932efb99d
2019-04-29 18:30:28 +08:00
Julia Reynolds
a540fa56d4 Fix visibility and editability of importance fields
- Block field should always be visible
- Locked by OEM: cannot block or change importance
- Locked by default app: cannot block, can change importance
- Locked by system app: cannot block, can change importance
- system app but blockable: can block, can change importance

Test: robotests
Fixes: 131248127
Change-Id: Ifa718c84573dd5125aefa4f672a79dc4f267d515
2019-04-28 22:01:36 -04:00
Yanting Yang
316c763316 Improve the latency of NotificationChannelSlice
Get the notification data in parallel to reduce the latency.

Fixes: 123065955
Test: visual, robotests

Change-Id: I434ec68197af214f540ba39ae9155ee7625a2742
2019-04-24 20:54:23 +08:00
Yi-Ling Chuang
acb50f2c6a Force the adapter to rebind cards with a toggle.
A card dismissal and scheduled card collection trigger a reload. During
card reloading, we perform slices pre check. The pre check goes through
the whole slice binding process, which means slices will be pinned and unpinned.
Hence, the on screen slices will gets unpinned resulting to the
unresponsive toggling.

As we have DiffCallbck implmented, if the card list are the same, then
bindView in the renderer will be ignored, which means the unpinned slice
will have no chance to re-register slice callback. So here we force it
to rebind the views.

Fixes: 123174237
Test: robotests
Change-Id: Id98bc16632bf024cbb611b40890e4d2629f08d7b
2019-04-23 17:19:56 +08:00
TreeHugger Robot
1fa45975eb Merge "Clean up NotificationChannelSlice" into qt-dev 2019-04-16 16:31:22 +00:00
TreeHugger Robot
77c56714ed Merge "Tint battery fix icon" into qt-dev 2019-04-16 16:25:34 +00:00
Yanting Yang
ce3359f4d4 Clean up NotificationChannelSlice
- Remove unused variable.
- Change function interface.

Bug: 123065955
Test: visual, robotests
Change-Id: I39c0a92539d45cdbc11bd9090a3ab97a72482632
2019-04-16 23:08:40 +08:00
Raff Tsai
006582b48e Tint battery fix icon
Fixes: 129492004
Test: manual
Change-Id: I161284619bc47e342d78f1507ae291f7c23ad3ff
2019-04-16 17:05:52 +08:00
Raff Tsai
000ba3fabe Remove error slice from Settings in rendering time
We filter error slice in EligibleCardChecker but not filter it in
SliceContextualCardRenderer, these two part should use the same
logic.

Fixes:128687331
Test: manual
Change-Id: I217bc6b578ceb36b0a67b44dc8a08ecd02771d82
2019-04-16 07:41:31 +08:00
Yanting Yang
b29e53a450 Log interacted package from ContextualNotificationChannelSlice
Fixes:129726858
Test: visual, robotests
Change-Id: Ife4043fe0bcb52445e8e2efec20781ce43c54fef
2019-04-12 15:28:29 +08:00
Yanting Yang
78e097f239 Hide notification channel slice that is interacted
- Ignore interacted package in ContextualNotificationChannelSlice.
- Regularly clear package record with background worker.

Bug:129726858
Test: visual, robotests

Change-Id: I94661a53bcbbe4a15479224c33cfb2eff345aa67
2019-04-12 15:27:49 +08:00
Mill Chen
f23b3b84d3 Fix conditionals not show up in homepage
Settings will not refresh conditionals status if there is no condition
card in homepage when Settings homepage gets in/out of window focus.
Whether or not there are conditional cards in the homepage, Settings
should always refresh conditional cards.

Fixes: 129725565
Test: robotests, visual
Change-Id: I1ed309d3fd4f7a2ba911097ea6b049c2aff48c8a
2019-04-11 14:43:58 -07:00
Raff Tsai
cc0cec4636 Merge "Remove old format contextual card log" into qt-dev 2019-04-10 23:42:48 +00:00
TreeHugger Robot
aa599e737a Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev 2019-04-10 18:25:45 +00:00
Raff Tsai
76e8acdee8 Remove old format contextual card log
These logs are replaced by SettingsIntelligenceLogWriter

Test: rebuild
Fixes: 124701288
Change-Id: Id93143a1f291878b7c212c35ed8683ca38d5fe17
2019-04-10 15:57:58 +08:00
Fan Zhang
4cb25ed087 Batch rename: homepage_* to contextual_* or condtion_*
Contextual cards are not bound to homepage. Remove prefix homepage from
layout and theme names.

Next step: update names for some resource values (dimen/color etc)

Bug: 130250419
Test: rebuild

Change-Id: I5e901268462aaa37e00493080ae09af001784823
2019-04-10 00:08:18 +00:00
Raff Tsai
40976d461e Record all contextual card log to MetricsFeatureProvider
Use ContextualCardLogUtils to serialize contextual card event to
string, and records the string using regular MetricFeatureProvider
logging APIs.

Bug: 124701288
Test: Robolectric, integrating test with SettingsIntelligence
Change-Id: Ie139b4f4b8a2b0f0dcc4bb8df9bdec8f5fd824a6
2019-04-09 13:12:02 -07:00
TreeHugger Robot
8b3cde0fb1 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev 2019-04-09 17:11:40 +00:00
TreeHugger Robot
a31acac404 Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev 2019-04-09 17:11:11 +00:00
Yi-Ling Chuang
734d826117 Remove viewFlipper used in contextual card dismissal.
- Use view's visibility to control which view we should show.
- Slice view can be built with normal height after removing viewFlipper.

Bug: 129438972
Bug: 128689305
Test: robotests
Change-Id: If7e9bd30d5cb5bcd3b9ff9f09cc2eae36543b9e9
2019-04-09 10:24:10 +00:00
Yi-Ling Chuang
dc2b2c7929 Inflate dismissal background instead of drawing while swiping
- Only swipe the foreground out to have the background revealed.
- Inflate dismissal_swipe_background.xml while swiping.
- Fix the fly-in transition.
- Fix the overlapping problem.

Bug: 129742618
Test: robotests
Change-Id: I5311e50332d0ea0437d1693d075d5c3a2176a443
2019-04-09 10:21:14 +00:00
Yi-Ling Chuang
21ffc13e5a Only enable feedback dialog in debuggable build.
Bug: 129881534
Test: robotests
Change-Id: I0dbd8c06f650cc7b3c32697f0c3af055912fab59
2019-04-09 18:07:50 +08:00