Commit Graph

426 Commits

Author SHA1 Message Date
TreeHugger Robot
520cb5851c Merge "Keep contextual card dismissal info upon deletion" into rvc-dev 2020-02-24 11:07:19 +00:00
Yi-Ling Chuang
5f8a084909 Keep contextual card dismissal info upon deletion
Add a config for contextual dismissal. This config is used to
determine whether the existing dismissal timestamp should be
kept before an insertion.

The new dismissal behaviour design replaces the boolean
value(isDismissed) with a long value(dismissedTimestamp) to give
this behaviour more flexibility. Utilizing the timestamp allows
developers to define new criteria of card's display (e.g cards being
dismissed can be shown again after a period of time).

While newly inserted data from SettingsIntelligence or other clients
may not have dismissal timestamp recorded. Turning on the config gives
the capability to persist dismissal timestamp, and more customized
behaviour can be created.

Bug: 143055685
Test: robotests
Change-Id: I9d095955e9c51f2aa3332d49ee230d3ded9ae744
Merged-In: I9d095955e9c51f2aa3332d49ee230d3ded9ae744
(cherry picked from commit 377125bf96)
2020-02-24 07:14:12 +00:00
Jason Chiu
05f5b8e7c4 Bluetooth device slice improvement
- remove "Pair new device" row
- change the on/off toggle to a plus button for pairing new device
- roll back the title "Bluetooth devices"

Bug: 149667096
Test: robotest
Change-Id: I47e9c47b2ab0adacdbdbde34522d7c0172adda75
Merged-In: I47e9c47b2ab0adacdbdbde34522d7c0172adda75
(cherry picked from commit 5e462a852b)
2020-02-24 06:16:18 +00:00
Yi-Ling Chuang
deea015b65 Implement new dismissal behaviour of contextual card
Currently, if a contextual card gets dismissed, it will be gone forever.
After this change, all cards being dismissed can be shown again after a
certain amount of time(e.g one day). In order to calculate the amount of
time, CARD_DISMISSED column is replaced with DISMISSED_TIMESTAMP. Once a
card gets dismissed, a timestamp will be recorded for a corresponding
card.

In this change, some methods are moved from CardDatabaseHelper to
ContextualCardFeatureProvider. So OEMs could replace the providers with
their own ones to get cards and have different dismissal behaviours.

Bug: 143055685
Test: rototests
Change-Id: I00ace98991cabcbfcae4fc47a44e9448683d680c
2020-02-20 18:45:14 +08:00
Jason Chiu
3d510a2ac4 Merge "Card showing mechanism change in homepage" 2020-02-17 06:17:34 +00:00
Sunny Shao
f0b0d46106 Remove the isCustomCard and related codes
Bug: 143058171
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I9d9ab16f327aef65599150e2f58b23bcb9986b30
2020-02-15 13:46:22 +08:00
TreeHugger Robot
c6ad5f77e8 Merge "Clean up unused DB columns." 2020-02-14 15:15:51 +00:00
Yi-Ling Chuang
682a30f4c9 Clean up unused DB columns.
Remove some columns from Contextual Card DB as they are never used.

Fixes: 143058171
Test: robotests
Change-Id: Ic618ccba16c3ed9f0a85b905535916e5d062d79e
2020-02-14 19:59:35 +08:00
Edgar Wang
77de405a5d Make TopLevelSettings un-searchable and direct result to relevant page.
Fixes: 149372187
Test: manual & robotest
Change-Id: I9daca03d1c11a262f8e3b55bb46aabbc035ece96
2020-02-14 17:58:38 +08:00
Jason Chiu
ca9ece1a0c Card showing mechanism change in homepage
- update contextual card proto interface to fit the new SettingsIntelligence
- show sticky cards at the tail of the card area

Bug: 149274976
Test: robotest
Change-Id: Icca167825c1c037ec12d8836d82c5fdff4331a8e
2020-02-14 17:44:11 +08:00
Jason Chiu
55563896be Revise homepage sticky cards UI
- revmove material card layout
- remove slice header's divider
- add dividers below each sticky cards
- simplify contextual_slice_full_tile layout

Bug: 149371123
Test: visual
Change-Id: I13a8af21f565114220a093409e2a9ca664a57b02
2020-02-12 19:15:26 +08:00
Yi Jiang
8cbebabad6 Merge "Moves Adaptive Sleep's settings from Settings.System to Settings.Secure" 2020-02-12 00:48:59 +00:00
Yi Jiang
63f2c5963a Moves Adaptive Sleep's settings from Settings.System to Settings.Secure
Test: atest AdaptiveSleepPreferenceControllerTest
Test: atest ContextualAdaptiveSleepSliceTest
Bug: 139319542

Change-Id: I9923dc3b6995c89efc1c775ccd2f134af87fc202
2020-02-07 00:44:01 +00:00
Edgar Wang
0934babbfc Make the fragment title can’t searchable
we shouldn't take users so deep into the settings IA because it's easy
to feel lost in settings after clicking on a result without additional
context.

Bug: 143055215
Test: robotest & manual
Change-Id: I337cb5ead31e1e4e7bf9be78132e90630f83ee43
2020-02-06 19:07:11 +08:00
TreeHugger Robot
1bfa4a8245 Merge "Revert "Revert "[Settings] Remove dependency of TelephonyIntents""" 2020-02-04 17:56:39 +00:00
Bonian Chen
106e52e021 Revert "Revert "[Settings] Remove dependency of TelephonyIntents""
This reverts commit 36d1c17c71.

Reason for revert: Fix has landed at ag/10241730

Change-Id: Iabde9194ed69b7bdb0a91058242bc0c239496dc5
2020-02-04 13:52:41 +00:00
Morten Krogh-Jespersen
36d1c17c71 Revert "[Settings] Remove dependency of TelephonyIntents"
This reverts commit 6a6b416c3d.

Reason for revert: b/148838390

Change-Id: I9be2c370c6923e9d7293e4eff5306bc54d49ade2
2020-02-04 13:10:59 +00:00
Sunny Shao
1f3429a25d Update dark theme slice for new display criteria
- Add "dark theme scheduling is off" as a new display creteria.

Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: Ib88edd0bd9d4b776cdf8ec93bac4e199e0da41de
2020-02-04 17:31:51 +08:00
Bonian Chen
6a6b416c3d [Settings] Remove dependency of TelephonyIntents
Remove the dependency of TelephonyIntents,
but monitoring the change of default data subscription and
PhoneStateListener.

Bug: 147101086
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ContextualCardManagerTest
Change-Id: I140640c1eed645614e6ed05b24389f6fba36eb76
2020-02-03 17:16:54 +08:00
TreeHugger Robot
814e65adcb Merge "Make Wifi and Bluetooth Slices not dismissable." 2020-01-21 10:56:58 +00:00
Yi-Ling Chuang
0ce468965c Make Wifi and Bluetooth Slices not dismissable.
Wifi and Bluetooth are sticky, so remove its dismiss-ability.

Bug: 143055685
Test: robotests
Change-Id: Iff7724fbb261299e2107ff3b89bd5d7abe507532
2020-01-21 17:51:05 +08:00
Jason Chiu
4223902866 Merge "Implement new design of Bluetooth card" 2020-01-21 09:24:13 +00:00
Jason Chiu
75e8f5ea6c Implement new design of Bluetooth card
- show only up to 2 connected devices
- show the Bluetooth toggle only when it's off
- remove subtext
- when bluetooth is on but there is no connected device, show the row
  "Pair new device"

Test: robotest
Bug: 142927894
Fixes: 147892635
Change-Id: I1559fc0a4cb0b42bf447d25417ac454c29fe86c3
2020-01-21 13:52:20 +08:00
Jason Chiu
1b0fbfeae6 Remove the specific UX of Deferred Setup card
Bug: 142927894
Test: visual, robotests
Change-Id: If93506fb11c6417967fab3d082b19947adef0d61
2020-01-21 11:47:13 +08:00
Yanting Yang
62fe52f292 Merge "Add bond state checking into BluetoothDevicesSlice" 2020-01-17 04:19:28 +00:00
Yanting Yang
9589041e1c Add bond state checking into BluetoothDevicesSlice
Make the Bluetooth device connected checking to be consistent with
BluetoothDeviceUpdater. Because it's more safe to check the bond state
and connected state together to handle abnoraml status from Bluetooth.

Fixes: 147351883
Test: visual, robotests
Change-Id: I4e34b73f16b44972fbb7273a5e13be1f3096835e
2020-01-16 18:38:14 +08:00
Yi-Ling Chuang
72da4a81f4 Make contextual card count configurable.
Decide how many card we should show at once on the homepage based on the
value in Settings Global for more flexibility. Fall back to the default
value if there is nothing set up.

Bug: 138754406
Test: robotests
Change-Id: I8d31d98eafb636a5e72af76ffec7e3dae0be3cbc
2020-01-16 16:20:56 +08:00
Sunny Shao
31c5f39d57 Update Dark theme slice for new behavior
- Add an broadcast receiver to monitor the Home key.
- Add the sClickedInSlice flag to verify Dark theme is changed by slice or not.

Bug: 142476879
Fixes: 146149658
Fixes: 146652692
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I174d0c861ea3b3f793201e3b2e0ff65a1e690f4e
2020-01-10 20:12:38 +08:00
TreeHugger Robot
5df80504c3 Merge "Change DEFAULT_CARD_COUNT for settings homepage." 2020-01-02 07:39:24 +00:00
Stanley Wang
5ce5349167 Remove the unused slices.
Remove the DataUsageSlice, DeviceInfoSlice and EmergencyInfoSlice.

Fixes: 146994847
Test: robotest
Change-Id: Ic840e9cc93e99b3c0a34eb6536401db34c98eca8
2019-12-30 19:04:49 +08:00
Automerger Merge Worker
1a33a04433 Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd am: 17bc83209f
Change-Id: I99ef0de75926ba951dd27154f0651e97ea826945
2019-12-20 15:56:50 +00:00
Automerger Merge Worker
17bc83209f Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd
Change-Id: I9f59dac9b64f2cb0acf31448c10cb0ef5c04da62
2019-12-20 15:35:13 +00:00
Yi-Ling Chuang
288200c27d Change DEFAULT_CARD_COUNT for settings homepage.
In the new design, we only show up to three cards at a time.

Bug: 138754406
Test: robotests
Change-Id: Ie38c3ee4b33068b9ecb4d6dcd3fa71df3fbd7d07
2019-12-20 17:57:33 +08:00
Sunny Shao
5f42f2f7a7 Update the behavior of the Dark theme slice
- Dark theme slice disappear when battery saver is ON.

Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
2019-12-20 13:25:49 +08:00
TreeHugger Robot
d04ad97133 Merge "Only show Condtionals when the feature flag is on." 2019-12-16 10:36:49 +00:00
Yi-Ling Chuang
9bda9af186 Only show Condtionals when the feature flag is on.
We plan to deprecate Settings Conditionals as it seems
duplicated with quick settings. For now, we set the default
value of this flag to false to disalbe it. OEMs could still
enalbe this feature by setting the flag on.

Bug: 142927361
Test: robotests
Change-Id: Ifaf710caf0045cb185b3a8c3b04f1ce537f67896
2019-12-16 17:13:21 +08:00
Automerger Merge Worker
107cd136a3 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
2019-12-16 08:31:03 +00:00
Automerger Merge Worker
11fa77b023 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
2019-12-16 08:15:54 +00:00
Bonian Chen
1247771b88 [Settings] Adopting public API
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
lesl
ff012f03a8 Wifi Setting: Use SoftApConfiguration for Tether Setting
Bug: 145578449
Test: Manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I02b4dcbb7b6e29b67ecc7356200f3fc3a1007562
2019-12-05 17:28:24 +08:00
Julia Reynolds
aceccce75c Reorganize notification Settings classes
The notification package was getting too big.

Test: make -j64 RunSettingsRoboTests
Fixes: 145224451
Change-Id: I25ba82f42f7a137d8adcce72dcf8089d0e018bdc
2019-11-27 10:02:13 -05:00
Sunny Shao
0a1f43a7c9 Merge "Add a dark theme slice" into qt-qpr1-dev am: 713143df37
am: e565a793be

Change-Id: I7b780475a3439d229a8b94e882372f7086bd02ed
2019-11-18 17:41:25 -08:00
Sunny Shao
e565a793be Merge "Add a dark theme slice" into qt-qpr1-dev
am: 713143df37

Change-Id: Ie026d122cb1aedd629d2860143aace2bdd599ae9
2019-11-18 17:38:13 -08:00
TreeHugger Robot
713143df37 Merge "Add a dark theme slice" into qt-qpr1-dev 2019-11-19 01:26:30 +00:00
Raff Tsai
4950d4cbc0 Fix robolectric error
Fixes: 144551238
Fixes: 144551930
Test: Robolectric
Change-Id: I33851ae2c4a06495f73e8db5d4df0992df5e7f3e
2019-11-18 10:39:22 +08:00
Hunter Knepshield
b0b539946f Merge "Synced the code from master branch" am: 64efbe1240
am: 418ef9973e

Change-Id: I430b9c45d007de822c87733b1eb4fc71b36ff23c
2019-11-15 10:54:38 -08:00
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch"
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
2019-11-15 10:45:58 -08:00
Sunny Shao
abcbc79d7d Add a dark theme slice
Fixes: 142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
2019-11-15 13:41:49 +08:00
Sunny Shao
f3865e9264 Synced the code from master branch
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-14 21:57:12 +08:00
Jason Chiu
21e8231523 Fix Settings creating too many threads unexpectedly
am: 48a0ff4304

Change-Id: I28068c2c68bffd0d97c1286df4f034a1f4a9825d
2019-11-13 09:40:13 -08:00